Changes up through Chapter 8

Committing all changes.