Final tweaks before the weekend...