Plenty of minor tweaks

Mostly because I am never happy.