Units are now properly accounted for in battles