Adding changes and FIXMEs to Chapter 1