Docs and fixes