last fixes for 0.2 release