fixed some classes
fixed bugs