diff --git a/scripts/scr_management/scr_management.gml b/scripts/scr_management/scr_management.gml
index 51156c30ed..bb123b719d 100644
--- a/scripts/scr_management/scr_management.gml
+++ b/scripts/scr_management/scr_management.gml
@@ -389,9 +389,9 @@ function scr_management(argument0) {
 			nam[22] = "Rhino";
 			nam[23] = "Land Speeder";
 			nam[24] = "Whirlwind";
-	        for (var i=0;i<array_length(obj_ini.name[0]);i++) {
-	        	if (obj_ini.name[company][i] == "") then continue;
-	        	unit = fetch_unit([company,i]);
+	        for (var i=0;i<array_length(obj_ini.TTRPG[company]);i++) {
+				unit = obj_ini.TTRPG[company][i];
+	        	if (unit.name() == "") then continue;
 	            if (unit.role()=role_names[eROLE.Captain]){
 					num[1]++;
 					nam[1] = unit.name();
@@ -415,16 +415,16 @@ function scr_management(argument0) {
 				if (unit.role() == role_names[eROLE.Scout]) then num[17]++;
 				if (unit.role() == "Venerable " + string(role_names[eROLE.Dreadnought])) then num[18]++;
 				if (unit.role() == role_names[eROLE.Dreadnought]) then num[19]++;
-				// Vehicles
-				if (i <= 100){
-					if (obj_ini.veh_role[company,i] == "Land Raider") then num[20]++;
-					if (obj_ini.veh_role[company,i] == "Predator") then num[21]++;
-					if (obj_ini.veh_role[company,i] == "Rhino") then num[22]++;
-					if (obj_ini.veh_role[company,i] == "Land Speeder") then num[23]++;
-					if (obj_ini.veh_role[company,i] == "Whirlwind") then num[24]++;
-				}
-				
-	        }
+		    }
+			
+			// Vehicles
+			for (var i=0;i<array_length(obj_ini.veh_role[company]);i++) {
+				if (obj_ini.veh_role[company][i] == "Land Raider") then num[20]++;
+				if (obj_ini.veh_role[company][i] == "Predator") then num[21]++;
+				if (obj_ini.veh_role[company][i] == "Rhino") then num[22]++;
+				if (obj_ini.veh_role[company][i] == "Land Speeder") then num[23]++;
+				if (obj_ini.veh_role[company][i] == "Whirlwind") then num[24]++;
+			}
 			
 	        with(obj_managment_panel){
 	        	if (manage!=obj_controller.temp[71]) then instance_deactivate_object(id);
diff --git a/scripts/scr_vehicle_count/scr_vehicle_count.gml b/scripts/scr_vehicle_count/scr_vehicle_count.gml
index 1cc616be17..59175fb746 100644
--- a/scripts/scr_vehicle_count/scr_vehicle_count.gml
+++ b/scripts/scr_vehicle_count/scr_vehicle_count.gml
@@ -5,8 +5,8 @@ function scr_vehicle_count(role, location="") {
     var _vehicle_count = 0;
     var _fetch = fetch_deep_array;
 
-    for (var j = 0; j < 11; j++) {
-        for (var i = 1; i <= 100; i++) {
+    for (var j = 0; j <=obj_ini.companies; j++) {
+        for (var i = 0; i < array_length(obj_ini.veh_role[j]); i++) {
             var _array_key = [j, i];
 
              if (_fetch(obj_ini.veh_role, _array_key) != role){
diff --git a/scripts/scr_vehicle_order/scr_vehicle_order.gml b/scripts/scr_vehicle_order/scr_vehicle_order.gml
index 75add290f5..8b4c6894df 100644
--- a/scripts/scr_vehicle_order/scr_vehicle_order.gml
+++ b/scripts/scr_vehicle_order/scr_vehicle_order.gml
@@ -22,7 +22,7 @@ function scr_vehicle_order(company_number) {
     var temp_race, temp_loc, temp_name, temp_role, temp_wep1, temp_lid, temp_wid, temp_wep2, temp_wep3, temp_upgrade, temp_acc, temp_hp, temp_chaos, temp_uid;
 
     // init arrays
-    for (var i = 0; i < 301; i++) { // TODO why 301?
+    for (var i = 0; i < array_length(obj_ini.veh_role[company_number]); i++) { 
         temp_race[company_number][i] = 0;
         temp_loc[company_number][i] = "";
         temp_name[company_number][i] = "";
@@ -40,7 +40,7 @@ function scr_vehicle_order(company_number) {
     }
 
 	// Check for vehicles
-    for (var i = 1; i <= 150; i++) { // TODO why 150?
+    for (var i = 0; i < array_length(obj_ini.veh_role[company_number]); i++) {
         var _is_vehicle_role =
         	veh_role[company_number][i] = "Rhino" // TODO change to enums/string ids
         	|| veh_role[company_number][i] = "Predator"
@@ -49,7 +49,6 @@ function scr_vehicle_order(company_number) {
         	|| veh_role[company_number][i] = "Land Raider";
 
         if (_is_vehicle_role) {
-            vehicle_count++;
             temp_race[company_number, vehicle_count] = veh_race[company_number][i];
             temp_loc[company_number, vehicle_count] = veh_loc[company_number][i];
             temp_name[company_number, vehicle_count] = veh_name[company_number][i];
@@ -64,13 +63,13 @@ function scr_vehicle_order(company_number) {
             temp_hp[company_number, vehicle_count] = veh_hp[company_number][i];
             temp_chaos[company_number, vehicle_count] = veh_chaos[company_number][i];
             temp_uid[company_number, vehicle_count] = veh_uid[company_number][i];
-
-            reset_vehicle_variable_arrays(company_number,i);
+            vehicle_count++;
         }
+        reset_vehicle_variable_arrays(company_number,i);
     }
 
     // do the ordering
-    for (var i = 1; i <= vehicle_count; i++) { // TODO why 150?
+    for (var i = 0; i < vehicle_count; i++) {
         veh_race[company_number][i] = temp_race[company_number][i];
         veh_loc[company_number][i] = temp_loc[company_number][i];
         veh_name[company_number][i] = temp_name[company_number][i];