Removed unneccesary comments and dead code
Spend a monsterous amount of time fixing a stupid bug