A bit more on chapter 18
Tweaks to chapter 24 per Ber