Minor tweaks as I find them

Will probably added to, merge what you will...