General cleanup

This is an ongoing PRQ for various pre-0.1.0 release cleanups and todo fixes.
http://stackoverflow.com/a/9208326/995325 ?