final tweaks before tagging