a bunch of minor tweaks