some last fixes, 0.3