Some final tweaks for today..