[Chapter 2] bunch of edits