Still trying to fix the battle issues