Adding changes and FIXMEs to Chapter 1
Merge pull request #3 from taustin/master

Adding changes and FIXMEs to Chapter 1