JohnMount rebuild (and fix docs)