Fixed some docstrings, and made some other minor changes