battle fixed some other bugs coming