Various improvements
0.2.1