cleaned up commented-out code, added some comments, should not change anything in the program