uniform changes, some uniform updates and bugfix for vehicle