[Chapter 6] some edits