Tweaks to chapters 29 and 30 per Franci.