quick chapter 6 fixes