Bunch of minor tweaks..