Restructured baseclass, fixed some combatbugs.