foo
Fix several small things (Chapter 9 exercises)