substantial edits to Chapter 2, and additional minors