adding classes, eunms, fixing a few things