WIP - continue updating comments and docstrings