Update to 0.2.1

Some fixes, and optimizations.