Finish Chapter 4. Fix some references.