fixed issues with new battle system