Some refactoring, combatboxes were a bit bugged.