More tweaking and cleaning up.
Bump.