Various fixes from proof reading

Mostly internal consistency plus a couple of minor fixes.