Fixes for Chapter 1. Boom!