chapter 4 fixes
chapter3 pre-finish