Updated chapter 1 and most of chapter 2.