Last tweaks before eclipse version becomes the main one.