General cleanup

This is an ongoing PRQ for various pre-0.1.0 release cleanups and todo fixes.
To be honest, I don't atm *know* what they are =p