More cleanup and bug fixes
0.2.0