Some major and minor tweaks to lots of things