diff --git a/addons/pike/CfgEventhandlers.hpp b/addons/pike/CfgEventhandlers.hpp
index be6bec5a73..f72363981a 100644
--- a/addons/pike/CfgEventhandlers.hpp
+++ b/addons/pike/CfgEventhandlers.hpp
@@ -5,6 +5,6 @@ class Extended_PreStart_EventHandlers {
 };
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE( call COMPILE_SCRIPT(XEH_preInit) );
+        init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
diff --git a/addons/pike/functions/fnc_ammoFired.sqf b/addons/pike/functions/fnc_ammoFired.sqf
index 118473e9da..e161c92c4a 100644
--- a/addons/pike/functions/fnc_ammoFired.sqf
+++ b/addons/pike/functions/fnc_ammoFired.sqf
@@ -15,14 +15,15 @@
  * Public: No
  */
 
-params ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_gunner"];
-TRACE_8("ammoFired",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_gunner);
+params ["_unit", "", "", "", "_ammo", "", "_projectile", "_gunner"];
+TRACE_4("ammoFired",_unit,_ammo,_projectile,_gunner);
 
 if (!local _gunner) exitWith {};
 if (isNull _projectile) exitWith {};
 
 // Get MissileGuidance args now
 private _firedEH = +_this;
+// Inject the submuntion ammo into guidance args
 _firedEH set [4, getText (configFile >> "CfgAmmo" >> _ammo >> "submunitionAmmo")];
 private _guidanceArgs = _firedEH call EFUNC(missileguidance,onFiredDeffered);
 _projectile setVariable [QGVAR(guidanceArgs), _guidanceArgs];
@@ -34,6 +35,7 @@ _projectile addEventHandler ["SubmunitionCreated", {
 
     private _guidanceArgs = _projectile getVariable [QGVAR(guidanceArgs), []];
     if (_guidanceArgs isEqualTo []) exitWith { ERROR_1("bad args %1",_projectile); };
+    // Inject the submuntion projectile and time into guidance args
     _guidanceArgs params ["_firedEH", "", "", "", "_stateParams"];
     _firedEH set [6, _submunitionProjectile]; // _firedEH params ["","","","","","","_projectile"];
     _stateParams set [0, diag_tickTime]; // _stateParams params ["_lastRunTime"]
@@ -48,6 +50,7 @@ _projectile addEventHandler ["SubmunitionCreated", {
         params ["_time", "_projectile"];
         if (isNull _projectile) exitWith {true};
         systemChat format ["%1 - %2", CBA_missionTime - _time, vectorMagnitude velocity _projectile];
+        false
     }, {}, [CBA_missionTime, _submunitionProjectile]] call CBA_fnc_waitUntilAndExecute;
     #endif
 }];
diff --git a/addons/pike/models/ace_pike_ammo.p3d b/addons/pike/models/ace_pike_ammo.p3d
index c98ca0fff5..9a60996295 100644
Binary files a/addons/pike/models/ace_pike_ammo.p3d and b/addons/pike/models/ace_pike_ammo.p3d differ
diff --git a/addons/pike/models/pike_surface.rvmat b/addons/pike/models/pike_surface.rvmat
deleted file mode 100644
index 043d6baa36..0000000000
--- a/addons/pike/models/pike_surface.rvmat
+++ /dev/null
@@ -1,76 +0,0 @@
-class StageTI {
-    texture = "a3\data_f\default_glass_ti_ca.paa";
-};
-ambient[] = {1,1,1,1};
-diffuse[] = {1,1,1,1};
-forcedDiffuse[] = {0,0,0,1};
-emmisive[] = {0,0,0,0};
-specular[] = {0.2,0.2,0.2,1};
-specularPower = 500;
-PixelShaderID = "Super";
-VertexShaderID = "Super";
-class Stage1 {
-    texture="#(argb,8,8,3)color(0.5,0.5,0.5,1)";
-    uvSource = "tex";
-    class uvTransform {
-        aside[] = {1,0,0};
-        up[] = {0,1,0};
-        dir[] = {0,0,1};
-        pos[] = {0,0,0};
-    };
-};
-class Stage2 {
-    texture = "#(argb,8,8,3)color(0.5,0.5,0.5,0.5,DT)";
-    uvSource = "tex";
-    class uvTransform {
-        aside[] = {1,0,0};
-        up[] = {0,1,0};
-        dir[] = {0,0,1};
-        pos[] = {0,0,0};
-    };
-};
-class Stage3 {
-    texture = "#(argb,8,8,3)color(0,0,0,0,MC)";
-    uvSource = "tex";
-    class uvTransform {
-        aside[] = {1,0,0};
-        up[] = {0,1,0};
-        dir[] = {0,0,1};
-        pos[] = {0,0,0};
-    };
-};
-class Stage4 {
-    texture = "#(argb,8,8,3)color(1,1,1,1,AS)";
-    uvSource = "tex";
-    class uvTransform {
-        aside[] = {1,0,0};
-        up[] = {0,1,0};
-        dir[] = {0,0,1};
-        pos[] = {0,0,0};
-    };
-};
-class Stage5 {
-    texture = "#(argb,8,8,3)color(0,0.6,1,1,SMDI)";
-    uvSource = "tex";
-    class uvTransform {
-        aside[] = {1,0,0};
-        up[] = {0,1,0};
-        dir[] = {0,0,1};
-        pos[] = {0,0,0};
-    };
-};
-class Stage6 {
-    texture = "#(ai,32,128,1)fresnel(1.6,1.4)";
-    uvSource="none";
-};
-class Stage7 {
-    useWorldEnvMap = "true";
-    texture = "a3\data_f\env_interier_car_ca.paa";
-    uvSource = "tex";
-    class uvTransform {
-        aside[] = {1,0,0};
-        up[] = {0,1,0};
-        dir[] = {0,0,1};
-        pos[] = {0,0,0};
-    };
-};