Chapter 07 fixes and now looks finished