Updated chapter 3 and 4, plus some little changes