Assorted changes of doom
Assorted tweaks