Editor fixes
Part of chapter 10