last fixes for alpha 0.1