chapter 3 and 5 fixes