Final corrections in chapter 1 and 2
Merged conflicts