some bug fixes
v1.0.1