edits and suggestions to chapter 1 to 5