Misc changes.

There is _nothing_ to see here.
this is long!