General edits, mostly chapter 1