more work on vehicle types/layout