Addressing Lagg's comments and altering a few comment/docstring blocks