update docstrings, clean up