couple of bug fixes
0.2.1