Improve some docstrings/comments