Added most of the feedback I received for the first two chapters