Apply improvements from dynamic car routing branch