fixes some vehicle stuff, and some random code that ended up commented

fixes some vehicle stuff, and some random code that ended up commented #3492