All the mentioned changes have been done.
Please review.