Chapter 3 edits.
Michael edits