editted some classes, added some others