Cleanup, small bugfixes.
0.1.2