more fixes in chapter 2