Updated some of the comments, added new commenting, and removed comented debug code