fixed problems introduced by last refactor so vehicle location is now updated correctly