fixing a couple of classes and updating