Minor update vehicles

Minor update vehicles doesn't work yet,
Minor fix
Added a few helpers