Some tweaks to chapter 10 per Franci.