[Chapter 6] bunch of edits