Cleaning up a bit for a 0.1.1 release.