diff --git a/@ExileServer/addons/a3_dms/DMS_init.sqf b/@ExileServer/addons/a3_dms/DMS_init.sqf
index c3b4dc2..cd4b6ed 100644
--- a/@ExileServer/addons/a3_dms/DMS_init.sqf
+++ b/@ExileServer/addons/a3_dms/DMS_init.sqf
@@ -17,6 +17,7 @@
 	//DMS_MissionMin 		= 60; // Timers in seconds
 	//DMS_MissionMax 		= 120; // Timers in seconds
 	//DMS_player_minDist = 700;
+	DMS_CleanUpTimer = 25; // set to 300 for 5 minutes to clean up the missions.
 	// CONFIGS
 
 	uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM1.sqf b/@ExileServer/addons/a3_dms/missions/MM1.sqf
index 5807913..b4fd7b7 100644
--- a/@ExileServer/addons/a3_dms/missions/MM1.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM1.sqf
@@ -18,7 +18,7 @@ diag_log format ["DMS :: Main Mission 1 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 uiSleep 2;
 //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";
@@ -31,20 +31,12 @@ uiSleep 2;
  waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30)  } count playableUnits > 0}; 
  
 uiSleep 1;
-/*
-
-[_pos] call MissionCompleted;
-[_pos,] call MissionCleanup;
-*/
 
 ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
 
 //  Run Cleanup
 [_pos] call DMS_CleanUp;
 
- 
-
- 
 
 uiSleep 150;
 
diff --git a/@ExileServer/addons/a3_dms/missions/MM10.sqf b/@ExileServer/addons/a3_dms/missions/MM10.sqf
index e20988a..29f76fa 100644
--- a/@ExileServer/addons/a3_dms/missions/MM10.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM10.sqf
@@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 10 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM2.sqf b/@ExileServer/addons/a3_dms/missions/MM2.sqf
index 47d2269..71ab243 100644
--- a/@ExileServer/addons/a3_dms/missions/MM2.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM2.sqf
@@ -21,7 +21,7 @@ diag_log format ["DMS :: Main Mission 2 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM3.sqf b/@ExileServer/addons/a3_dms/missions/MM3.sqf
index e24cee5..4103e70 100644
--- a/@ExileServer/addons/a3_dms/missions/MM3.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM3.sqf
@@ -20,7 +20,7 @@ diag_log format ["DMS :: Main Mission 3 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 uiSleep 2;
 //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";
diff --git a/@ExileServer/addons/a3_dms/missions/MM4.sqf b/@ExileServer/addons/a3_dms/missions/MM4.sqf
index b2d6127..560efd0 100644
--- a/@ExileServer/addons/a3_dms/missions/MM4.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM4.sqf
@@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 4 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM5.sqf b/@ExileServer/addons/a3_dms/missions/MM5.sqf
index e4b278b..7b54ee3 100644
--- a/@ExileServer/addons/a3_dms/missions/MM5.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM5.sqf
@@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 5 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 //[_crate] call createBox;
 // [_crate, amount of weapons, amount of ammo] call createBox;
 [1,_crate] call DMS_createBox;
diff --git a/@ExileServer/addons/a3_dms/missions/MM6.sqf b/@ExileServer/addons/a3_dms/missions/MM6.sqf
index 2d5d217..d71b5c1 100644
--- a/@ExileServer/addons/a3_dms/missions/MM6.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM6.sqf
@@ -21,7 +21,7 @@ diag_log format ["DMS :: Main Mission 6 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM7.sqf b/@ExileServer/addons/a3_dms/missions/MM7.sqf
index 2ade1fa..18f988a 100644
--- a/@ExileServer/addons/a3_dms/missions/MM7.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM7.sqf
@@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 7 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM8.sqf b/@ExileServer/addons/a3_dms/missions/MM8.sqf
index 2ef145b..8c5f17f 100644
--- a/@ExileServer/addons/a3_dms/missions/MM8.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM8.sqf
@@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 8 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
diff --git a/@ExileServer/addons/a3_dms/missions/MM9.sqf b/@ExileServer/addons/a3_dms/missions/MM9.sqf
index 4e0929a..5224646 100644
--- a/@ExileServer/addons/a3_dms/missions/MM9.sqf
+++ b/@ExileServer/addons/a3_dms/missions/MM9.sqf
@@ -21,7 +21,7 @@ diag_log format ["DMS :: Main Mission 9 started at (%1)",_pos];
 [_pos,_missname] call DMS_CreateMarker;
 
 // Spawn Box
-_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
+_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
 [1,_crate] call DMS_createBox;
 
 uiSleep 2;
@@ -33,7 +33,7 @@ uiSleep 2;
 
 
 
- waitUntil{sleep 25;  {isPlayer _x && _x distance _pos < 30  } count playableUnits > 0}; 
+ waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30)  } count playableUnits > 0}; 
  
 uiSleep 1;
 
diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf
index c96434e..016b1b0 100644
--- a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf
+++ b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf
@@ -1,5 +1,8 @@
 private ["_pos"];
 _pos = _this select 0;
+deleteMarker "DMS_MainMarker";
+deleteMarker "DMS_MainDot";
+uiSleep DMS_CleanUpTimer;
 {
     _x enableSimulation false;
     _x removeAllMPEventHandlers "mpkilled";
@@ -16,10 +19,10 @@ _pos = _this select 0;
     deleteVehicle _x;
     deleteGroup (group _x);
     _x = nil;
-    deleteMarker "DMS_MainMarker";
-    deleteMarker "DMS_MainDot";
 
- } forEach (_pos nearObjects 50);
+ } forEach (_pos nearObjects 80);
+
+ diag_log "DMS :: Mission got cleaned up!";
 
 
 
diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf
index 8f334ac..cc9eb77 100644
--- a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf
+++ b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf
@@ -15,11 +15,14 @@
 	
 	for "_i" from 1 to _units do {
 		_soldier = _group createUnit ["i_g_soldier_unarmed_f", [_pos select 0, _pos select 1, 0], [], 1, "Form"];
+		_soldier addeventhandler ["fired", {(_this select 0) setvehicleammo 1}];
+
 		removeAllAssignedItems _soldier;
 		removeUniform _soldier;
 		removeHeadgear _soldier;
 		removeAllItems _soldier;
 		removeAllWeapons _soldier;
+		uiSleep 1;
 		_soldier forceaddUniform "U_I_officerUniform";
 		_soldier addVest " V_TacVest_blk_POLICE "; 
 		_soldier addGoggles "G_Tactical_Clear";
@@ -105,5 +108,4 @@
 			};
 		};
 	};
-
 _soldier
\ No newline at end of file
diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo
index ffce06f..d87add3 100644
Binary files a/Pre-Packed PBO/a3_dms.pbo and b/Pre-Packed PBO/a3_dms.pbo differ