Finishing chp1 up, some edits to Chp2,3