diff --git a/README.md b/README.md
index cd153d6b..73a9b535 100644
--- a/README.md
+++ b/README.md
@@ -795,10 +795,8 @@
 * Claymores are no longer triggered by enemy players
 * Stun fx is linked to the player
 * Stun fx shows in the correct position for projectiles
-* Stunning enemy players steals 50 points from them
-* Meleeing enemy players steals 100 points from them
+* Stunning enemy players steals 100 points from them
 * Downing enemy players awards 500 points
-* Bleeding out enemy players awards 1000 points to all teammates
 * Landing on top of an enemy player that is prone downs them
 * Increased max radius for landing on top of an enemy player by 16.66%
 * Decreased max height for landing on top of an enemy player by 50%
@@ -823,6 +821,7 @@
 #### Grief
 * Gain score by making enemy players bleed out
 * Make 10 enemy players bleed out to win the game
+* Bleeding out enemy players awards 1000 points to all teammates
 * Players respawn after being down for 10 seconds
 * Players retain perks
 
@@ -831,6 +830,7 @@
 * Win 3 rounds to win the game
 * Tie round if both teams die within 5 seconds of eachother
 * Players start each round with at least 10000 points
+* Bleeding out enemy players awards 1000 points to all teammates
 * Enemies remaining audio and text displays when enemy players down instead of when enemy players bleed out
 * Last player alive audio only plays for the player who is alive instead of every player on the team
 * Players do not get their weapons back on the next round if they bled out
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 8b0678bd..5daf83c2 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1847,8 +1847,6 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 
 			dir = vectorNormalize(dir);
 			self setVelocity(amount * dir);
-
-			self store_player_damage_info(eattacker, sweapon, smeansofdeath);
 		}
 
 		if ( is_true( self._being_shellshocked ) && !is_melee )
@@ -1856,6 +1854,14 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 			return;
 		}
 
+		if ( !is_true( self._being_shellshocked ) )
+		{
+			score = 100 * maps\mp\zombies\_zm_score::get_points_multiplier(eattacker);
+			self stun_score_steal(eattacker, score);
+
+			eattacker.killsdenied++;
+		}
+
 		if ( isDefined( level._effect[ "butterflies" ] ) )
 		{
 			self do_game_mode_stun_fx(einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime);
@@ -1864,20 +1870,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 		self thread do_game_mode_shellshock(is_melee, is_weapon_upgraded(sweapon));
 		self playsound( "zmb_player_hit_ding" );
 
-		score = 50;
-		if(is_melee)
-		{
-			score = 100;
-		}
-
-		score *= maps\mp\zombies\_zm_score::get_points_multiplier(eattacker);
-		self stun_score_steal(eattacker, score);
-		eattacker.killsdenied++;
-
-		if(!is_melee)
-		{
-			self store_player_damage_info(eattacker, sweapon, smeansofdeath);
-		}
+		self store_player_damage_info(eattacker, sweapon, smeansofdeath);
 	}
 }
 
@@ -1886,7 +1879,7 @@ do_game_mode_stun_fx(einflictor, eattacker, idamage, idflags, smeansofdeath, swe
 	pos = vpoint;
 	angle = vectorToAngles(eattacker getCentroid() - self getCentroid());
 
-	if ( (isDefined( sweapon ) && weapontype( sweapon ) == "grenade") || (isDefined( sweapon ) && weapontype( sweapon ) == "projectile") )
+	if ( isDefined( sweapon ) && ( weapontype( sweapon ) == "grenade" || weapontype( sweapon ) == "projectile" ) )
 	{
 		pos_offset = vectorNormalize(vpoint - self getCentroid()) * 8;
 		pos_offset = (pos_offset[0], pos_offset[1], 0);