some tweaks to Chapter 2