Docs and minor cleanup