Try to de-uglify a couple of diagrams.
New version of chapter 5.
Various bits of tidying up.
Lots of tweaks, mostly to the eval.  Includes importing results of the
latest batch of experiments.