Renamed locations, added post battle logic