Fixes for chapter 4, intro and section 1