More correcctions to battle.java