Various changes based on chapter revisions