Updates to some docstrings, preparation for sphinx doc