push around some white-space.
Add documentation, and minor reorganization.
Revert a bad idea.
More documentation