Some fixes in chapter 1
Shuffle around implementantion parts
Last fixes