comment tweaks, and change to vehicle definition