Fixup some comments and docstrings