Docs and cleaning up