Extra checks

And added vehicleoptions to the pdf creator