Proofing and changes to chapter 2 and 3