tons of minor tweaks