merge some corrections from Rod for chapter 1