Chapter 2 & 3: edits & additions