more comments and getting rid of extra classes that weren't used