fixed battle bug and formating