Some more chapter 4 changes.
Boom, the rest of chapter 4...