Whole bunch of minor updates to various things

Mostly tweaking