More changes and additions

More minor fixes, addition and amends.

See diff & comments