updates to battle system