fixes and improvements for chapter 3 and 4