Cleanup a bit, add a test.
Couple tweaks, expand readme.