+ chapter 2.3.2 - improvement
+chapters 3.1-3.2
+ chapter 3.3