Fixed a comment
Fixed two docstrings
Various fixes