some refinement on vehicle demos