Minor edits preceding re-ordering.
Half way through a major rewrite.