catch up with chapter 2 fixes