Final tweaks before second iteration launch