fix and clean up
v0.8.6