Fixes and cleanups
0.1.2