Commenting

Fixing up comments and docstrings