Improvements to docstrings. Other minor changes.