More docstring changes, testing, formatting...