Finish chapter 1 fixes