[Chapter 5] editing complete

Plus a single Chapter 7 edit.