fixes in chapter 2