cleanup bugs
0.0.6