some improvements on vehicle, event