Fixing errors related to an unfinished refactor

Added docstrings to a number of methods as well