some local fixes
v0.0.6
0.0.6