Minor improvements and tests
0.2.0