Made a few more bug fixes
Prepared to release 0.0.22.