Minor tweaks to chapters 16 and 17 per Franci.