Took out some printlns, added some more comments, checked over some things