chapter 1 improved
chapter 2 rewritten