numerous bug fixes
0.0.1