Update comments and UPM Vehicles