Final tweaks, cos a viz is never dun