Fix bugs
Finish chapter 2