Fix up options checking. Document server option