Chapter 9 corrections from @limenet