Last tweaks before public release