Post review, some fixes made