correct comparions of vehicle part index
fix of issue 5755
small braces fix and comment removing
Merge bugfixes.