Chapter 3 changes

lots of small improvements