Small improvements to Chapter 6