lots of edits for chapter 3, per reviewer comments