Added comments, removed some debug statements

Some commented out debug statements left in...