More changes.  Chapter 2 redo almost completed.