Started Chapter 4 after a long wait, and tidied stuff up.