Update to 0.2.2

Some bug fixes, speedups, and additions.