lot of minor tweaks