Cleanup, documentation tweaks