vehicle fixes and some other stuff