Changing some comments and FIXMEs
No need for docstring to be so verbose