corrects names of classes

Also comment out some lines