Add chapter 13, correct earlier ones. Tested with a full build.