Cleanup and bug fixes
0.0.5