More docstrings, minor changes.