Final tweaks before 1st release