Docs and re-jigging