Docs and fixups