Integrate feedback for Chapters 12-21

Issue #88