considered all the notes in #1
fixed additional small things in chapter 1 and 7