Commenting and cleanup

Rolling through code and commenting and cleaning up source