More clean up, documentation, and such.
General clean up.