Documentation changes and cleaning up the global namespace.