some fixes
fixes base classes