fixed some classes