changed in control-
for ,car in pairs(cars) do
if car.name == "locomotive" then table.insert(locos,car) end
if car.name == "cargo-wagon" then table.insert(wagons,car) end
if car.name == "fluid-wagon" then table.insert(fluid_wagons,car) end
to -
for ,car in pairs(cars) do
if car.type == "locomotive" then table.insert(locos,car) end
if car.type == "cargo-wagon" then table.insert(wagons,car) end
if car.type == "fluid-wagon" then table.insert(fluid_wagons,car) end

Nevermind, that fix converted all non vanilla rolling stock to vanilla, but after a little more editing I now have it working for non vanilla stock

care to share those little more edits?