fixed to chapter 7
review fixes chapter 8