Fixed chapter references and a few minor wording issues