Documentation/docstring fixes

Same as before, but based onto develop