A bunch of minor tweaks - potentially more coming