Cleanup
Added some sections in chapter 3