[Chapter 6] some edits
[Chapter 4] edits
[Chapter 5] edits