Small improvements to Chapter 2