some bugfixes
v0.0.8