[Chapter 7] some edits