diff --git a/sources/NiceGameType.uc b/sources/NiceGameType.uc
index 7d1c2a8..5eb9578 100644
--- a/sources/NiceGameType.uc
+++ b/sources/NiceGameType.uc
@@ -75,6 +75,7 @@ State MatchInProgress{
 function ScoreKill(Controller Killer, Controller Other)
 {
     local NicePlayerController niceKiller;
+    local NiceHumanPawn niceKillerPawn;
     local PlayerReplicationInfo OtherPRI;
     local float KillScore;
     local Controller C;
@@ -201,8 +202,13 @@ function ScoreKill(Controller Killer, Controller Other)
     /* End Marco's Kill Messages */
     niceKiller = NicePlayerController(killer);
     if (niceKiller != none && niceKiller.abilityManager != none) {
+        niceKillerPawn = NiceHumanPawn(niceKiller.pawn);
         niceKiller.abilityManager.AddToAllCooldowns(-1);
     }
+    if (    niceKillerPawn != none && NiceBoomStick(niceKillerPawn.weapon) != none
+        &&  other != none && other.pawn != none && other.pawn.default.health >= 1000) {
+        niceKillerPawn.invincibilityTimer += 1.0;
+    }
 }
 
 function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){
diff --git a/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickAltFire.uc b/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickAltFire.uc
index 4365656..82bcb3c 100644
--- a/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickAltFire.uc
+++ b/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickAltFire.uc
@@ -1,13 +1,13 @@
 class NiceBoomStickAltFire extends NiceBoomStickFire;
 // Overload to force last shot to have a different animation with reload
 // NICETODO: uncomment this
-function name GetCorrectAnim(bool bLoop, bool bAimed){
+function name GetCorrectAnim(bool bLoop, bool bAimed) {
     if(currentContext.sourceWeapon != none && currentContext.sourceWeapon.MagAmmoRemainingClient > 0)
-       return super.GetCorrectAnim(bLoop, bAimed);
+        return super.GetCorrectAnim(bLoop, bAimed);
     if(bAimed)
-       return 'Fire_Last_Iron';
+        return 'Fire_Last_Iron';
     else
-       return 'Fire_Last';
+        return 'Fire_Last';
     return FireAnim;
 }
 defaultproperties
diff --git a/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickFire.uc b/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickFire.uc
index 070012c..837c195 100644
--- a/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickFire.uc
+++ b/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickFire.uc
@@ -58,6 +58,6 @@ defaultproperties
     ShakeOffsetTime=3.500000
     BotRefireRate=2.500000
     aimerror=2.000000
-    Spread=3000.000000
+    Spread=2000.000000
     FireAnimRate=1.25
 }