v0.3 some fixes