Got doctest to pass and docstring changes