More changes.

I really should have made all these little changes before I decided to
throw it up on git