Fix linting and omitted doc file
Fix docstring so it doesn't make Sphinx choke.
re-add forgotten imports