An bug from chapter 4 fixed and new places in chapter 1