last fixes before stable 1.0