* final tweaks before commit