Kindly review a patch , covered points #16.1 , #16.2 and #16.4 as suggested b...