Lots of minor tweaks