Done with most of the fixes in chapter 2.