Chapter 5 and 7 - Some corrections