Fix any bugs - Fix battle logic