Bunch of fixes for chapter 2.

Moving right along with this...
Some more chapter 2 changes.