A few more tweaks!