v0.3.1

Underscores are stupid most of the time. Clean up more. Few more tests.