fixes and cleanup
0.2.2