bunch of minor tweaks