Added all the feedback from the peer reviews
Fixed some issues