v0.2.1
more clean-up