Improvements to docstring and docs