Fixes comments and docstrings