Updated.

For the Kader/KFDI, I don't know what is the best solution: "KFDI" does not seem to be used like that, and the full name is quite long. Some references seem to mention only "Kader", I used that for now, but it can be easily changed: https://www.imcdb.org/vehicles_make-Kader.html