* More fixes and docstrings.