A couple of more tweaks..