Multiple minor changes and improvements since the initial release.

This version isn't final but should hopefully be good enough.