Cleaning up Chapter 8 bugs to prep for Chapter 9.