Fixes some mistakes
Add small fixes
Finish chapter 8