various changes up to chapter 10