Resolves #63, the bug that was found in the fix, as well as clean up some of the comments