finish chapter 8
new bug fix