v0.02 some bugfix