Patch 1

Some fixes/suggestions for chapter 15 (please see commit comments for details)