further improvements to vehicle class and subclasses