diff --git a/entityclasses.xml b/entityclasses.xml
index e01edc6..3fa5954 100644
--- a/entityclasses.xml
+++ b/entityclasses.xml
@@ -15,20 +15,23 @@
 <!-- <property name="UserSpawnType" value="Menu"/> -->
 		<!-- Can be spawned in F6 Menu and Console (Default setting if no property set except when extended) -->
 
+<!-- <property name="SwapMats" value="@:Entities/Zombies/Zombies/Materials/HD_Arlene_Radiated2.mat,@:Entities/Zombies/Zombies/Materials/HD_Arlene_Radiated3.mat"/> -->
+		<!-- Swaps materials for index 0 to x based on commas. Empty commas like ,, skip over that index -->
+
 <entity_classes>
 
 <!-- *** PLAYER -->
 
 		<!-- *** PLAYER_NEW_MALE -->
 <entity_class name="playerNewMale">
-    <property name="Class" value="EntityNewStyleAvatar"/>
+	<property name="Class" value="EntityNewStyleAvatar"/>
 	<property name="UserSpawnType" value="None"/>
-    <!--<property name="EntityType" value="NewStyleAvatar"/>-->
-    <property name="Tags" value="entity,player,human"/>
-    <property name="Prefab" value="/Entities/Player/Male/malePrefab"/>
-    <!--<property name="ModelType" value="UMA"/>-->
-    <property name="Parent" value="Players"/>
-    <property name="IsMale" value="true"/>
+	<!--<property name="EntityType" value="NewStyleAvatar"/>-->
+	<property name="Tags" value="entity,player,human"/>
+	<property name="Prefab" value="/Entities/Player/Male/malePrefab"/>
+	<!--<property name="ModelType" value="UMA"/>-->
+	<property name="Parent" value="Players"/>
+	<property name="IsMale" value="true"/>
 </entity_class>
 
 		<!-- *** PLAYER_MALE -->
@@ -128,7 +131,7 @@
 			<requirement name="ProgressionLevel" progression_name="perkUrbanCombatJumping" operation="Equals" value="0"/>
 		</passive_effect>
 
-		<passive_effect name="StaminaChangeOT" operation="base_set" value="10"/>
+		<passive_effect name="StaminaChangeOT" operation="base_set" value="10"/> <!-- PLAYER_MALE_BASE_SET -->
 		<!-- <passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.5" tags="running"/>the Ext Char Stats ignore the tag and display this as current -->
 	</effect_group>
 
@@ -148,10 +151,10 @@
 
 	<effect_group>
 		<requirement name="!EntityHasMovementTag" tags="idle"/>
-			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.45" tags="running"/>
-			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.1" tags="floating"/>
-			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.15" tags="swimming"/>
-			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.9" tags="swimmingRun"/>
+			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.45" tags="running"/> <!-- IF_NOT_IDLE -->
+			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.1" tags="floating"/> <!-- IF_NOT_IDLE -->
+			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.15" tags="swimming"/> <!-- IF_NOT_IDLE -->
+			<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.9" tags="swimmingRun"/> <!-- IF_NOT_IDLE -->
 		<!--
 		EntityHasMovementTag (climbing,floating,idle,jumping,running,swimming,walking)
 			possibly (crouching, standing, idle, walking, running, swimming, floating, jumping, falling, climbing)
@@ -159,13 +162,13 @@
 	</effect_group>
 
 	<effect_group>
-		<!--
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.4">
-			<requirement name="CVarCompare" cvar="_underwater" operation="Equals" value="1"/>
-		</passive_effect>
-		-->
+		
+		<!-- <passive_effect name="StaminaChangeOT" operation="perc_add" value="-.4"> --> <!-- NOT_USED -->
+			<!-- <requirement name="CVarCompare" cvar="_underwater" operation="Equals" value="1"/> -->
+		<!-- </passive_effect> -->
+		
 
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="1.35" tags="running">
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="1.35" tags="running">  <!-- GREAT_HEIST_CROUCH_RUN -->
 			<!-- Stealthy Sprinting:  Use no stamina while sneak sprinting. -->
 			<requirement name="ProgressionLevel" progression_name="perkGreatHeistSprintSneak" operation="Equals" value="1"/>
 			<requirement name="CVarCompare" cvar="_crouching" operation="Equals" value="1"/>
@@ -179,25 +182,25 @@
 		<passive_effect name="BuffResistance" operation="base_add" value="-.1" tags="buffInjuryStunned01CHTrigger,buffInjuryBleedingTwo"/>
 
 <!--
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" tags="swimming"/>
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" tags="swimming"/> NOT_USED
 
 		<requirement name="CVarCompare" cvar="_underwater" operation="Equals" value="1"/>
 
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" match_all_tags="true" tags="swimming,walking"/>
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.35" match_all_tags="true" tags="swimming,running"/>
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" match_all_tags="true" tags="swimming,walking"/> NOT_USED
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.35" match_all_tags="true" tags="swimming,running"/> NOT_USED
 
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75"/>
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75"/> NOT_USED
 			<requirement name="CVarCompare" cvar="_underwater" operation="Equals" value="1"/>
 		</passive_effect>
 
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" match_all_tags="true" tags="swimming,walking"/>
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.35" match_all_tags="true" tags="swimming,running"/>
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" match_all_tags="true" tags="swimming,walking"/> NOT_USED
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.35" match_all_tags="true" tags="swimming,running"/> NOT_USED
 
 
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" match_all_tags="true" tags="swimming,walking"/>
-		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.35" match_all_tags="true" tags="swimming,running"/>
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-.75" match_all_tags="true" tags="swimming,walking"/> NOT_USED
+		<passive_effect name="StaminaChangeOT" operation="perc_add" value="-1.35" match_all_tags="true" tags="swimming,running"/> NOT_USED
 -->
-		<!-- <passive_effect name="StaminaChangeOT" operation="base_set" value="-10" match_all_tags="true" tags="crouching,running"/>
+		<!-- <passive_effect name="StaminaChangeOT" operation="base_set" value="-10" match_all_tags="true" tags="crouching,running"/> NOT_USED
 		this is redundant because running is covered.
 		With a different value the base_set would override the previous one -->
 
@@ -1732,7 +1735,7 @@
 		<!-- *** ZOMBIE_BURNT_FERAL -->
 <entity_class name="zombieBurntFeral" extends="zombieBurnt">
 	<property name="UserSpawnType" value="Menu"/>
-	<property name="Tags" value="entity,zombie,feral"/>
+	<property name="Tags" value="entity,zombie,walker,feral"/>
 	<property name="Mesh" value="@:Entities/Zombies/Prefabs/ZBurntFeral.prefab"/>
 	<property name="SoundSpawn" value="Ambient_Loops/a_fire_embersmoke_sm_lp"/>
 
@@ -2734,7 +2737,7 @@
 		<!-- *** ZOMBIE_LAB_RADIATED -->
 <entity_class name="zombieLabRadiated" extends="zombieLabFeral">
 	<property name="UserSpawnType" value="Menu"/>
-    <property name="Tags" value="entity,zombie,walker,feral,radiated"/>
+	<property name="Tags" value="entity,zombie,walker,feral,radiated"/>
 	<property name="Mesh" value="@:Entities/Zombies/Prefabs/ZLabRadiated.prefab"/>
 
 	<!-- Gameplay zombieLabRadiated -->
@@ -3481,7 +3484,7 @@
 	<property name="Mesh" value="@:Entities/Zombies/Prefabs/ZHawaiianRadiated.prefab"/>
 
 	<!-- Gameplay zombieFatHawaiianRadiated -->
-	<property name="DismemberMultiplierHead" value="0"/><property name="DismemberMultiplierArms" value="0"/><property name="DismemberMultiplierLegs" value="0"/><!-- Radiated -->
+	<property name="DismemberMultiplierHead" value=".4"/><property name="DismemberMultiplierArms" value="0"/><property name="DismemberMultiplierLegs" value="0"/><!-- Radiated -->
 	<property name="PainResistPerHit" value=".9"/><!-- Radiated -->
 	<property name="ExperienceGain" value="1500"/><!-- XP strong radiated -->
 	<property name="LootDropEntityClass" value="EntityLootContainerStrong"/>
@@ -3811,7 +3814,7 @@
 	<property name="MoveSpeedAggro" value="0.6, 1.45"/> <!-- fit, feral -->
 	<property name="JumpMaxDistance" value="4.6, 5"/>
 	<property name="HandItem" value="meleeHandZombieFeral"/>
-	<property name="ExperienceGain" value="750"/><!-- XP grunt feral -->
+	<property name="ExperienceGain" value="1200"/><!-- XP grunt feral -->
 	<property name="LootDropProb" value=".03"/> <!-- Feral -->
 
 	<effect_group name="Base Effects">
@@ -3831,7 +3834,7 @@
 	<!-- Gameplay zombieSoldierRadiated -->
 	<property name="DismemberMultiplierHead" value="0"/><property name="DismemberMultiplierArms" value="0"/><property name="DismemberMultiplierLegs" value="0"/><!-- Radiated -->
 	<property name="PainResistPerHit" value=".9"/><!-- Radiated -->
-	<property name="ExperienceGain" value="1200"/><!-- XP grunt radiated -->
+	<property name="ExperienceGain" value="1500"/><!-- XP grunt radiated -->
 	<property name="LootDropEntityClass" value="EntityLootContainerStrong"/>
 
 	<effect_group name="Base Effects">
@@ -4966,13 +4969,11 @@
 	<property name="HasDeathAnim" value="false"/>
 	<property name="CanBigHead" value="false" />
 	<property name="AIFeralSense" value="1.6"/>
+	<property name="AIGroupCircle" value="0"/>
 	<property name="AITask-1" value="BreakBlock"/>
-	<property name="AITask-2" value="Territorial"/>
-	<property name="AITask-3" value="ApproachAndAttackTarget" data="class=EntityPlayer,20"/>
-	<property name="AITask-4" value="ApproachSpot"/>
-	<property name="AITask-5" value="Look"/>
-	<property name="AITask-6" value="Wander"/>
-	<property name="AITask-7" value=""/>
+	<property name="AITask-2" value="ApproachAndAttackTarget" data="class=EntityPlayer,100"/>
+	<property name="AITask-3" value="ApproachSpot"/>
+	<property name="AITask-4" value=""/>
 	<property name="AITarget-1" value="SetAsTargetIfHurt" data="class=EntityPlayer"/>
 	<property name="AITarget-2" value="BlockingTargetTask"/>
 	<property name="AITarget-3" value="SetNearestCorpseAsTarget" data="flags=player"/>
@@ -4982,6 +4983,10 @@
 	<property name="MoveSpeed" value=".4"/>
 	<property name="MoveSpeedAggro" value="1.65, 1.82"/>
 	
+	<property name="MaxViewAngle" value="360"/>
+	<property name="SightRange" value="100"/>
+	<property name="SightLightThreshold" value="-2,-2"/>
+	
 	<!-- Gameplay  -->
 	<property name="HandItem" value="meleeHandAnimalCoyote"/>
 	<property name="MoveSpeedPanic" value="1.5"/>
@@ -5792,7 +5797,7 @@ Kinda sorta works but is buggy and we don't have time for that.
 	<property name="MoveSpeedPanic" value="1.15"/>
 	<property name="CanClimbLadders" value="true"/>
 	<property name="IsEnemyEntity" value="true"/>
-	<property name="SurfaceCategory" value="organic"/>
+	<property name="SurfaceCategory" value="earth"/>
 	<property name="WalkType" value="7"/>
 	<property name="ParticleOnDeath" value="blood_death"/>
 	<property name="SoundRandomTime" value="200.0"/>
diff --git a/items.xml b/items.xml
index 481075f..1199387 100644
--- a/items.xml
+++ b/items.xml
@@ -2002,6 +2002,9 @@
 			<requirement name="CompareItemMetaFloat" operation="GTE" value="4" key="charge"/></triggered_effect>
 			
 		<!-- set shock duration -->
+		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="ModifyCVar" target="other" cvar="stunBatonDuration" operation="set" value="4">
+			<requirement name="ProgressionLevel" progression_name="perkElectrocutioner" operation="Equals" value="0"/>
+			<requirement name="CompareItemMetaFloat" operation="GTE" value="4" key="charge"/></triggered_effect>
 		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="ModifyCVar" target="other" cvar="stunBatonDuration" operation="set" value="4.8">
 			<requirement name="ProgressionLevel" progression_name="perkElectrocutioner" operation="Equals" value="1"/>
 			<requirement name="CompareItemMetaFloat" operation="GTE" value="4" key="charge"/></triggered_effect>
@@ -2017,6 +2020,9 @@
 		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="ModifyCVar" target="other" cvar="stunBatonDuration" operation="set" value="8">
 			<requirement name="ProgressionLevel" progression_name="perkElectrocutioner" operation="Equals" value="5"/>
 			<requirement name="CompareItemMetaFloat" operation="GTE" value="4" key="charge"/></triggered_effect>
+		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="ModifyCVar" target="other" cvar="stunBatonDuration" operation="set" value="4">
+			<requirement name="ProgressionLevel" progression_name="perkElectrocutioner" operation="Equals" value="0"/>
+			<requirement name="CompareItemMetaFloat" operation="GTE" value="4" key="charge"/></triggered_effect>
 		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="ModifyCVar" target="other" cvar="stunBatonDuration" operation="set" value="4.8">
 			<requirement name="ProgressionLevel" progression_name="perkElectrocutioner" operation="Equals" value="1"/>
 			<requirement name="CompareItemMetaFloat" operation="GTE" value="4" key="charge"/></triggered_effect>
@@ -2104,29 +2110,39 @@
 			<requirement name="CompareItemMetaFloat" operation="Equals" value="4" key="charge"/></triggered_effect>
 		
 		<!-- trigger ragdoll events for fully charged baton -->
-		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="Ragdoll" target="other" duration="2.5" force="350">
+		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="Ragdoll" target="other" duration="@stunBatonDuration" force="350">
 			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/>
 			<requirement name="HasBuff" buff="buffmodMeleeStunBatonRepulsor"/>
-			<requirement name="!HasBuff" buff="buffDrugNerdTats"/>
 			<requirement name="!EntityTagCompare" target="other" tags="trader"/>
 		</triggered_effect>
-		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="Ragdoll" target="other" duration="2.5" force="350">
+		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="Ragdoll" target="other" duration="@stunBatonDuration" force="350">
 			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/>
 			<requirement name="HasBuff" buff="buffmodMeleeStunBatonRepulsor"/>
-			<requirement name="!HasBuff" buff="buffDrugNerdTats"/>
 			<requirement name="!EntityTagCompare" target="other" tags="trader"/>
 		</triggered_effect>
+		
 		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="Ragdoll" target="otherAOE" range="1.1" duration="2.5" force="350" target_tags="zombie,animal">
 			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/>
 			<requirement name="HasBuff" buff="buffmodMeleeStunBatonRepulsor"/>
 			<requirement name="!HasBuff" buff="buffDrugNerdTats"/>
 		</triggered_effect>
-		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="Ragdoll" target="otherAOE" range="1.1" duration="2.5" force="350" target_tags="zombie,animal">
+		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="Ragdoll" target="otherAOE" range="1.3" duration="2.5" force="350" target_tags="zombie,animal">
 			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/>
 			<requirement name="HasBuff" buff="buffmodMeleeStunBatonRepulsor"/>
 			<requirement name="!HasBuff" buff="buffDrugNerdTats"/>
 		</triggered_effect>
 		
+		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="Ragdoll" target="otherAOE" range="1.1" duration="@stunBatonDuration" force="350" target_tags="zombie,animal">
+			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/>
+			<requirement name="HasBuff" buff="buffmodMeleeStunBatonRepulsor"/>
+			<requirement name="HasBuff" buff="buffDrugNerdTats"/> <!-- if you have buffDrugNerdTats, use stun duration so zombies get up after stun is finished -->
+		</triggered_effect>
+		<triggered_effect trigger="onSelfSecondaryActionRayHit" action="Ragdoll" target="otherAOE" range="1.3" duration="@stunBatonDuration" force="350" target_tags="zombie,animal">
+			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/>
+			<requirement name="HasBuff" buff="buffmodMeleeStunBatonRepulsor"/>
+			<requirement name="HasBuff" buff="buffDrugNerdTats"/> <!-- if you have buffDrugNerdTats, use stun duration so zombies get up after stun is finished -->
+		</triggered_effect>
+		
 		<!-- trigger shock events for fully charged baton -->
 		<triggered_effect trigger="onSelfPrimaryActionRayHit" action="AddBuff" target="other" buff="buffShocked" duration="@stunBatonDuration">
 			<requirement name="CompareItemMetaFloat" operation="Equals" value="5" key="charge"/></triggered_effect>
@@ -4684,10 +4700,10 @@
 		<property name="Particles_muzzle_fire" value="gunfire_AK47"/>
 		<property name="Particles_muzzle_fire_fpv" value="gunfire_AK47_fpv"/>
 		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
-                <property name="triggerEffectTriggerPullDualsense" value="RifleTrigger"/>
-                <property name="triggerEffectTriggerPullXbox" value="PistolTrigger"/>
-                <property name="triggerEffectTriggerShootDualsense" value="MGShoot"/>
-                <property name="triggerEffectTriggerShootXbox" value="PistolShoot"/>
+		<property name="triggerEffectTriggerPullDualsense" value="RifleTrigger"/>
+		<property name="triggerEffectTriggerPullXbox" value="PistolTrigger"/>
+		<property name="triggerEffectTriggerShootDualsense" value="MGShoot"/>
+		<property name="triggerEffectTriggerShootXbox" value="PistolShoot"/>
 	</property>
 	<property class="Action1">
 		<property name="Class" value="Zoom"/>
@@ -7199,7 +7215,6 @@
 	<effect_group name="ammoShotgunSlug" tiered="false">
 		<passive_effect name="EntityDamage" operation="base_set" value="102" tags="perkBoomstick"/>
 		<passive_effect name="BlockDamage" operation="base_set" value="80" tags="perkBoomstick"/>
-		<passive_effect name="BlockDamage" operation="base_add" value="200" tags="wood"/>
 		<passive_effect name="RoundRayCount" operation="base_set" value="1" tags="perkBoomstick"/>
 		<passive_effect name="MaxRange" operation="base_set" value="18" tags="perkBoomstick"/>
 		<passive_effect name="DamageFalloffRange" operation="base_set" value="9" tags="perkBoomstick"/>
@@ -8214,6 +8229,7 @@
 	<property name="UnlockedBy" value="perkArtOfMiningPallets"/> <!-- BOOK_PERK -->
 	<property name="Material" value="Morganic"/>
 	<property name="Stacknumber" value="5"/>
+	<property name="EconomicValue" value="6000"/>
 	<property name="SellableToTrader" value="false"/>
 	<property name="Group" value="Resources"/>
 	<property class="Action0">
@@ -8228,6 +8244,7 @@
 <item name="resourceWoodBundle">
 	<property name="Extends" value="resourceRockSmallBundle"/>
 	<property name="CustomIcon" value="resourceWood"/>
+	<property name="EconomicValue" value="3000"/>
 	<property class="Action0">
 		<property name="Create_item" value="resourceWood"/>
 		<property name="Create_item_count" value="6000"/>
@@ -8283,6 +8300,7 @@
 	<property name="Extends" value="resourceRockSmallBundle"/>
 	<property name="CustomIcon" value="ammoGasCan"/>
 	<property name="UnlockedBy" value="craftingVehicles"/> <!-- perkGreaseMonkey -->
+	<property name="EconomicValue" value="1500"/>
 	<property class="Action0">
 		<property name="Create_item" value="ammoGasCan"/>
 		<property name="Create_item_count" value="5000"/>
@@ -8294,6 +8312,7 @@
 	<property name="Extends" value="resourceRockSmallBundle"/>
 	<property name="CustomIcon" value="resourceGunPowder"/>
 	<property name="UnlockedBy" value="craftingExplosives"/><!-- perkDemolitionsExpert -->
+	<property name="EconomicValue" value="1000"/>
 	<property class="Action0">
 		<property name="Create_item" value="resourceGunPowder"/>
 		<property name="Create_item_count" value="1000"/>
@@ -8342,7 +8361,7 @@
 	</property>
 	<property class="Action1"> <!-- UseAction -->
 		<property name="Class" value="Activate"/>
-		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
 		<property name="Delay" value="1"/> <!-- obsolete if rounds per minute exists -->
 	</property>
 	<property name="ThrowableDecoy" value="true"/>
@@ -8360,31 +8379,31 @@
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="1"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".1"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".1"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".05"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="2"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".2"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".2"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".1"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="3"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".3"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".3"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".2"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="4"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".4"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".4"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".3"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="5"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".5"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".5"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".45"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="HasBuff" buff="buffDrugAtomJunkies"/>
@@ -8397,6 +8416,8 @@
 <item name="thrownGrenadeContact">
 	<property name="Tags" value="ammo,weapon,attPerception,perkDemolitionsExpert,explosivesSkill"/>
 	<property name="ItemTypeIcon" value="explosion"/>
+	<property name="CustomIconTint" value="191,37,13"/>
+    <property name="TintColor" value="191,37,13"/>
 	<property name="DisplayType" value="ammoGrenadeContact"/>
 	<property name="Class" value="ItemClassTimeBomb"/>
 	<property name="HoldType" value="57"/>
@@ -8438,7 +8459,7 @@
 		<property name="Class" value="Activate"/>
 		<property name="Delay" value="1"/>
 		<property name="Sound_start" value="grenade_pullpin"/>
-		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
 	</property>
 	<property name="ThrowableDecoy" value="true"/>
 	<effect_group tiered="false">
@@ -8499,31 +8520,31 @@ add knockdown resist to armor
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="1"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".1"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".1"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".05"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="2"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".2"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".2"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".1"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="3"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".3"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".3"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".2"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="4"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".4"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".4"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".3"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="5"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".5"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".5"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".45"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="HasBuff" buff="buffDrugAtomJunkies"/>
@@ -8535,6 +8556,8 @@ add knockdown resist to armor
 
 <item name="thrownGrenade">
 	<property name="Extends" value="thrownGrenadeContact" param1="ExplodeOnHit"/>
+	<property name="CustomIconTint" value="59,62,55"/>
+    <property name="TintColor" value="59,62,55"/>
 	<property name="Meshfile" value="@:Other/Items/Weapons/Ranged/Grenade/GrenadePrefab.prefab"/>
 	<property name="UnlockedBy" value="craftingExplosives"/><!-- perkDemolitionsExpert,thrownGrenadeSchematic, -->
 	<property name="DisplayType" value="ammoGrenade"/>
@@ -8550,7 +8573,7 @@ add knockdown resist to armor
 		<property name="Class" value="Activate"/>
 		<property name="Delay" value="1"/>
 		<property name="Sound_start" value="grenade_pullpin"/>
-		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
 	</property>
 
 <!--
@@ -8558,31 +8581,31 @@ add knockdown resist to armor
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="1"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".1"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".1"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".05"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="2"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".2"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".2"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".1"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="3"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".3"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".3"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".2"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="4"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".4"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".4"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".3"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="5"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".5"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".5"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".45"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="HasBuff" buff="buffDrugAtomJunkies"/>
@@ -8641,7 +8664,7 @@ add knockdown resist to armor
     <property name="Class" value="Activate"/>
     <property name="Delay" value="1"/>
     <!-- obsolete if rounds per minute exists -->
-	<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+	<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
   </property>
   <property name="ThrowableDecoy" value="true"/>
 	<effect_group tiered="false">
@@ -8657,31 +8680,31 @@ add knockdown resist to armor
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="1"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".1"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".1"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".05"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="2"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".2"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".2"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".1"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="3"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".3"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".3"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".2"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="4"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".4"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".4"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".3"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="5"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".5"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".5"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".45"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="HasBuff" buff="buffDrugAtomJunkies"/>
@@ -8727,7 +8750,7 @@ add knockdown resist to armor
 	</property>
 	<property class="Action1"> <!-- UseAction -->
 		<property name="Class" value="Activate"/>
-		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
 		<property name="Delay" value="1"/> <!-- obsolete if rounds per minute exists -->
 	</property>
 	<property name="ThrowableDecoy" value="true"/>
@@ -8744,31 +8767,31 @@ add knockdown resist to armor
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="1"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".1"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".1"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".05"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="2"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".2"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".2"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".1"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="3"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".3"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".3"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".2"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="4"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".4"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".4"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".3"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="ProgressionLevel" progression_name="perkDemolitionsExpert" operation="Equals" value="5"/>
 			<passive_effect name="EntityDamage" operation="perc_add" value=".5"/>
 			<passive_effect name="BlockDamage"  operation="perc_add" value=".5"/>
-			<passive_effect name="DismemberChance" operation="base_add" value=".45"/>
+			<passive_effect name="DismemberChance" operation="base_add" value="0"/>
 	</effect_group>
 	<effect_group tiered="false" name="workaround for explosives ignoring perks/buffs">
 		<requirement name="HasBuff" buff="buffDrugAtomJunkies"/>
@@ -8834,7 +8857,7 @@ add knockdown resist to armor
 		<property name="Class" value="Activate"/>
 		<property name="Delay" value="1"/>
 		<!-- obsolete if rounds per minute exists -->
-		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
 		<property name="triggerEffectTriggerPullDualsense" value="RifleTrigger"/>
 		<property name="triggerEffectTriggerPullXbox" value="PistolTrigger"/>
 		<property name="triggerEffectTriggerShootDualsense" value="RifleShoot"/>
@@ -8903,7 +8926,7 @@ add knockdown resist to armor
 	<property class="Action1"> <!-- UseAction -->
 		<property name="Class" value="Activate"/>
 		<property name="Delay" value="1"/> <!-- obsolete if rounds per minute exists -->
-		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value=".98"/>
+		<requirement name="CVarCompare" cvar="_underwater" operation="LT" value="1"/>
 	</property>
 	<effect_group tiered="false">
 		<passive_effect name="BlockDamage" operation="base_set" value="1"/><display_value name="dExDamageBlock" value="1"/>
@@ -12105,7 +12128,7 @@ perkNightStalkerSilentNight
     
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffInjuryAbrasionTreated">
 			<requirement name="HasBuff" buff="buffInjuryAbrasion"/>
-    </triggered_effect>
+		</triggered_effect>
 
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="medicalRegHealthAmount" operation="add" value="30"/>
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="medRegHealthIncSpeed" operation="set" value="@medicRegHealthIncreaseSpeed"/>
@@ -12118,18 +12141,16 @@ perkNightStalkerSilentNight
 		<!-- used on other -->
 		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="healAbrasionMult" operation="set" value="3"/>
     
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffInjuryAbrasionTreated">
-      <requirement name="HasBuff" buff="buffInjuryAbrasion"/>
-    </triggered_effect>
-
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medicalRegHealthAmount" operation="add" value="30"/>
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="@medicRegHealthIncreaseSpeed"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffInjuryAbrasionTreated">
+		  <requirement name="HasBuff" buff="buffInjuryAbrasion"/>
+		</triggered_effect>
 
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medicalRegHealthAmount" operation="add" value="30"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="@medicRegHealthIncreaseSpeed"/>
 
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffProcessConsumables"/>
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="RemoveBuff" target="other" buff="buffInjuryBleeding"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffProcessConsumables"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="RemoveBuff" target="other" buff="buffInjuryBleeding"/>
 
-    
 		<!-- used on other, regular health per tick based on perkPhysician -->
 		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="2">
 			<requirement name="ProgressionLevel" progression_name="perkPhysician" operation="Equals" value="0"/></triggered_effect>
@@ -12206,7 +12227,7 @@ perkNightStalkerSilentNight
     
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffInjuryAbrasionTreated">
 			<requirement name="HasBuff" buff="buffInjuryAbrasion"/>
-    </triggered_effect>
+		</triggered_effect>
 
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="medicalRegHealthAmount" operation="add" value="180"/>
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="medRegHealthIncSpeed" operation="set" value="@medicRegHealthIncreaseSpeed"/>
@@ -12217,20 +12238,18 @@ perkNightStalkerSilentNight
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="RemoveBuff" buff="buffLaceration"/><display_value name="dStopsLaceration" value="1"/>
 
 		<!-- used on other -->
-
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="healAbrasionMult" operation="set" value="4"/>
-    
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffInjuryAbrasionTreated">
-      <requirement name="HasBuff" buff="buffInjuryAbrasion"/>
-    </triggered_effect>
-    
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="healAbrasionMult" operation="set" value="4"/>
+		
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffInjuryAbrasionTreated">
+		  <requirement name="HasBuff" buff="buffInjuryAbrasion"/>
+		</triggered_effect>
+		
 		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medicalRegHealthAmount" operation="add" value="180"/>
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="@medicRegHealthIncreaseSpeed"/>
-    
-    
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffProcessConsumables"/>
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="RemoveBuff" target="other" buff="buffInjuryBleeding"/>
-    <triggered_effect trigger="onSelfSecondaryActionEnd" action="RemoveBuff" target="other" buff="buffLaceration"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="@medicRegHealthIncreaseSpeed"/>
+		
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="other" buff="buffProcessConsumables"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="RemoveBuff" target="other" buff="buffInjuryBleeding"/>
+		<triggered_effect trigger="onSelfSecondaryActionEnd" action="RemoveBuff" target="other" buff="buffLaceration"/>
 
 		<!-- used on other, regular health per tick based on perkPhysician -->
 		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="2">
@@ -12243,8 +12262,7 @@ perkNightStalkerSilentNight
 			<requirement name="ProgressionLevel" progression_name="perkPhysician" operation="Equals" value="3"/></triggered_effect>
 		<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" target="other" cvar="medRegHealthIncSpeed" operation="set" value="3.5">
 			<requirement name="ProgressionLevel" progression_name="perkPhysician" operation="Equals" value="4"/></triggered_effect>
-
-		</effect_group>
+	</effect_group>
   
 	<effect_group tiered="false">
 		<!-- medical XP gains -->
@@ -12554,7 +12572,7 @@ perkNightStalkerSilentNight
 	<effect_group tiered="false">
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="RemoveBuff" buff="buffInjuryConcussion"/><display_value name="dStopsConcussion" value="1"/>
 		<display_value name="dInstantHealth" value="40"/>
-		<display_value name="dHealthLoss" value=".1"/>
+		<!-- <display_value name="dHealthLoss" value=".1"/> -->
 		<display_value name="$waterAmountAdd" value="-40"/>
 		<display_value name="dStunResist" value="1"/>
 		<display_value name="dDuration" value="180"/>
@@ -12662,8 +12680,8 @@ perkNightStalkerSilentNight
 	<property name="Extends" value="drugRecog"/>
 	<property name="DisplayType" value="drugFortBites"/>
 	<effect_group tiered="false" name="Drug Tier 4">
-		<display_value name="dHealthLoss" value=".5"/>
-		<display_value name="$waterAmountAdd" value="-30"/>
+		<display_value name="dHealthLoss" value=".4"/>
+		<display_value name="$waterAmountAdd" value="-20"/>
 		<display_value name="dDuration" value="360"/>
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="$buffDrugFortBitesDuration" operation="add" value="363"/>
 		<triggered_effect trigger="onSelfPrimaryActionEnd" action="ModifyCVar" cvar="$buffDrugFortBitesDuration" operation="set" value="1083">
@@ -14430,7 +14448,7 @@ perkNightStalkerSilentNight
 		<requirement name="NotHasBuff" buff="buffIsOnFire"/>
 			<display_value name="dEntityDamage" value="4"/>
 			<display_value name="dStunResist" value="1"/>
-			<display_value name="dHealthLoss" value=".5"/>
+			<!-- <display_value name="dHealthLoss" value=".5"/> -->
 			<display_value name="dHealthAmount" value="20"/>
 			<display_value name="dStaminaRegen" value=".6"/>
 			<display_value name="dDuration" value="60"/>
@@ -21370,6 +21388,7 @@ perkNightStalkerSilentNight
 	<property name="CreativeMode" value="Dev"/>
 	<property name="CustomIcon" value="thrownGrenadeContact"/>
 	<property name="CustomIconTint" value="200,0,255"/>
+    <property name="TintColor" value="200,0,255"/>
 	<property name="Stacknumber" value="500"/>
 	<property name="Explosion.RadiusBlocks" value="15"/>
 	<property name="Explosion.RadiusEntities" value="15"/>
@@ -22700,6 +22719,144 @@ perkNightStalkerSilentNight
 	</effect_group>
 </item>
 
+<!-- *** ADMIN_BUFF_ITEMS -->
+
+	<!-- *** ADMIN_GIVE_BUFF_INFECTION -->
+<item name="adminGiveBuffInfection">
+	<property name="CreativeMode" value="Dev"/>
+	<property name="DescriptionKey" value="adminGiveBuffDesc"/>
+	<property name="CustomIcon" value="drinkJarGrandpasForgettingElixir"/>
+	<property name="CustomIconTint" value="255,0,0"/>
+	<property name="TintColor" value="255,0,0"/>
+	<property name="HoldType" value="3"/>
+	<property name="ItemTypeIcon" value="computer"/>
+	<property name="Meshfile" value="@:Other/Items/Food/bottled_waterPrefab.prefab"/>
+	<property name="DropMeshfile" value="@:Other/Items/Misc/sack_droppedPrefab.prefab"/>
+	<property name="Material" value="Mglass"/>
+	<property name="Weight" value="10"/>
+	<property name="Stacknumber" value="1"/>
+	<property name="SellableToTrader" value="false"/>
+	<property name="Group" value="Special Items"/>
+	<property name="ShowQuality" value="false"/>
+	<property class="Action0">
+		<property name="Class" value="Eat"/>
+		<property name="Consume" value="false"/>
+		<property name="Delay" value="1"/>
+		<property name="Sound_start" value="player_drinking"/>
+	</property>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerInfection"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_ABRASION -->
+<item name="adminGiveBuffAbrasion">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="drinkJarGrandpasForgettingElixir"/>
+	<property name="CustomIconTint" value="255,153,0"/>
+	<property name="TintColor" value="255,153,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerAbrasion"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_FATIGUED -->
+<item name="adminGiveBuffFatigued">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="drinkJarGrandpasForgettingElixir"/>
+	<property name="CustomIconTint" value="255,255,0"/>
+	<property name="TintColor" value="255,255,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerFatigued"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_LACERATION -->
+<item name="adminGiveBuffLaceration">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="drinkJarGrandpasForgettingElixir"/>
+	<property name="CustomIconTint" value="0,255,0"/>
+	<property name="TintColor" value="0,255,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerLaceration"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_CONCUSSION -->
+<item name="adminGiveBuffConcussion">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="drinkJarGrandpasForgettingElixir"/>
+	<property name="CustomIconTint" value="0,0,255"/>
+	<property name="TintColor" value="0,0,255"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerConcussion"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_DYSENTERY -->
+<item name="adminGiveBuffDysentery">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="drinkJarGrandpasForgettingElixir"/>
+	<property name="CustomIconTint" value="102,0,255"/>
+	<property name="TintColor" value="102,0,255"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="buffDysenteryCatchDrink"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_SPRAINED_LEG -->
+<item name="adminGiveBuffSprainedLeg">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="apparelSuitDressShoes"/>
+	<property name="CustomIconTint" value="255,153,0"/>
+	<property name="TintColor" value="255,153,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerSprainedLeg"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_BROKEN_LEG -->
+<item name="adminGiveBuffBrokenLeg">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="apparelSuitDressShoes"/>
+	<property name="CustomIconTint" value="255,0,0"/>
+	<property name="TintColor" value="255,0,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerBrokenLeg"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_SPRAINED_ARM -->
+<item name="adminGiveBuffSprainedArm">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="armorMilitaryGloves"/>
+	<property name="CustomIconTint" value="255,153,0"/>
+	<property name="TintColor" value="255,153,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerSprainedArm"/>
+	</effect_group>
+</item>
+
+	<!-- *** ADMIN_GIVE_BUFF_Broken_Arm -->
+<item name="adminGiveBuffBrokenArm">
+	<property name="Extends" value="adminGiveBuffInfection"/>
+	<property name="CreativeMode" value="Dev"/>
+	<property name="CustomIcon" value="armorMilitaryGloves"/>
+	<property name="CustomIconTint" value="255,0,0"/>
+	<property name="TintColor" value="255,0,0"/>
+	<effect_group tiered="false">
+		<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="triggerBrokenArm"/>
+	</effect_group>
+</item>
+
 <!-- *** Test items used to test buffs/perks that increase loot quantities -->
 <item name="TEST_ITEM_01">
 	<property name="Extends" value="resourcePaper"/>
diff --git a/progression.xml b/progression.xml
index f166097..195c972 100644
--- a/progression.xml
+++ b/progression.xml
@@ -851,7 +851,7 @@
 			</passive_effect>
 
 			<!-- Once rifle crafting skill reaches 100, set the probability bonus of finding rifle crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="riflesCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="riflesCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingRifles" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -861,7 +861,7 @@
 			</passive_effect>
 
 			<!-- When all Sniper books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="sniperProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="sniperProb">
 				<requirement name="ProgressionLevel" progression_name="perkSniperComplete" operation="Equals" value="1"/>
 			</passive_effect>
 			
@@ -906,7 +906,7 @@
 			</passive_effect>
 
 			<!-- Once explosive crafting skill reaches 100, set the probability bonus of finding explosive crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="explosivesCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="explosivesCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingExplosives" operation="Equals" value="100"/>
 			</passive_effect>
 		</effect_group>
@@ -947,7 +947,7 @@
 			</passive_effect>
 
 			<!-- Once spear crafting skill reaches 75, set the probability bonus of finding spear crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="spearsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="spearsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingSpears" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -957,7 +957,7 @@
 			</passive_effect>
 
 			<!-- When all Spear Hunter books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="spearHunterProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="spearHunterProb">
 				<requirement name="ProgressionLevel" progression_name="perkSpearHunter8Complete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -1069,7 +1069,7 @@
 			</passive_effect>
 
 			<!-- When all Hunter's Journal books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,3" value="0,0" tags="huntingProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,3" value="1,1" tags="huntingProb">
 				<requirement name="ProgressionLevel" progression_name="perkHuntingJournalComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1124,7 +1124,7 @@
 			</passive_effect>
 
 			<!-- When all Lucky Looter books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="luckyProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="luckyProb">
 				<requirement name="ProgressionLevel" progression_name="perkLuckyLooterComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1174,7 +1174,7 @@
 			</passive_effect>
 
 			<!-- Once salvage tools crafting skill reaches 75, set the probability bonus of finding salvage tools crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="salvageToolsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="salvageToolsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingSalvageTools" operation="Equals" value="75"/>
 			</passive_effect>
 			
@@ -1184,7 +1184,7 @@
 			</passive_effect>
 
 			<!-- When all Wasteland Treasures books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="wastelandProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="wastelandProb">
 				<requirement name="ProgressionLevel" progression_name="perkWasteTreasuresComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1233,7 +1233,7 @@
 			</passive_effect>
 
 			<!-- Once shotgun crafting skill reaches 100, set the probability bonus of finding shotgun crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="shotgunsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="shotgunsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingShotguns" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -1243,7 +1243,7 @@
 			</passive_effect>
 
 			<!-- When all Shotgun Messiah books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="shotgunMessiahProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="shotgunMessiahProb">
 				<requirement name="ProgressionLevel" progression_name="perkShotgunMessiahComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1301,7 +1301,7 @@
 			</passive_effect>
 
 			<!-- Once club crafting skill reaches 75, set the probability bonus of finding club crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="clubsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="clubsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingClubs" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -1311,7 +1311,7 @@
 			</passive_effect>
 
 			<!-- When all Batter Up books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="batterUpProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="batterUpProb">
 				<requirement name="ProgressionLevel" progression_name="perkBatterUpComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1403,7 +1403,7 @@
 			</passive_effect>
 
 			<!-- Once sledgehammer crafting skill reaches 75, set the probability bonus of finding sledgehammer crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="sledgehammersCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="sledgehammersCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingSledgehammers" operation="Equals" value="75"/>
 			</passive_effect>
 		</effect_group>
@@ -1538,7 +1538,7 @@
 			</passive_effect>
 
 			<!-- Once armor crafting skill reaches 75, set the probability bonus of finding armor crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,4" value="0,0" tags="armorCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,4" value="1,1" tags="armorCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingArmor" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -1548,7 +1548,7 @@
 			</passive_effect>
 
 			<!-- When all Needle & Thread books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,4" value="0,0" tags="needleProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,4" value="1,1" tags="needleProb">
 				<requirement name="ProgressionLevel" progression_name="perkNeedleAndThreadComplete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -1599,7 +1599,7 @@
 				<requirement name="ProgressionLevel" progression_name="craftingFood" operation="LT" value="100"/>
 			</passive_effect>
 			<!-- Once food crafting skill reaches 100, set the probability bonus of finding food crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,3" value="0,0" tags="foodCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,3" value="1,1" tags="foodCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingFood" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -1631,7 +1631,7 @@
 			</passive_effect>
 
 			<!-- Once harvesting tools crafting skill reaches 100, set the probability bonus of finding harvesting tool crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="harvestingToolsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="harvestingToolsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingHarvestingTools" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -1641,7 +1641,7 @@
 			</passive_effect>
 
 			<!-- When all Art of Mining books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="artOfMiningProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="artOfMiningProb">
 				<requirement name="ProgressionLevel" progression_name="perkArtOfMiningComplete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -1706,7 +1706,7 @@
 			</passive_effect>
 
 			<!-- Once knuckle crafting skill reaches 75, set the probability bonus of finding knuckle crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="knucklesCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="knucklesCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingKnuckles" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -1716,7 +1716,7 @@
 			</passive_effect>
 
 			<!-- When all Bar Brawling books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="barBrawlingProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="barBrawlingProb">
 				<requirement name="ProgressionLevel" progression_name="perkBarBrawling8Complete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -1806,7 +1806,7 @@
 			</passive_effect>
 
 			<!-- Once machine gun crafting skill reaches 100, set the probability bonus of finding machine gun crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="machineGunsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="machineGunsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingMachineGuns" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -1816,7 +1816,7 @@
 			</passive_effect>
 
 			<!-- When all Automatic Weapons Handbook books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="autoWeaponsProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="autoWeaponsProb">
 				<requirement name="ProgressionLevel" progression_name="perkAutoWeaponsComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1904,7 +1904,7 @@
 			</passive_effect>
 
 			<!-- When all Fireman's Almanac books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,3" value="0,0" tags="firemansProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,3" value="1,1" tags="firemansProb">
 				<requirement name="ProgressionLevel" progression_name="perkFiremansAlmanacComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -1933,7 +1933,7 @@
 			</passive_effect>
 
 			<!-- Once seed crafting skill reaches 20, set the probability bonus of finding seed crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="seedCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="seedCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingSeeds" operation="Equals" value="20"/>
 			</passive_effect>
 
@@ -2058,7 +2058,7 @@
 			</passive_effect>
 
 			<!-- Once bow crafting skill reaches 100, set the probability bonus of finding bow crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="bowsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="bowsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingBows" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -2068,7 +2068,7 @@
 			</passive_effect>
 
 			<!-- When all Ranger's Guide to Archery books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="rangersProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="rangersProb">
 				<requirement name="ProgressionLevel" progression_name="perkRangersComplete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -2107,7 +2107,7 @@
 			</passive_effect>
 
 			<!-- Once handgun crafting skill reaches 100, set the probability bonus of finding handgun crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="handgunsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="handgunsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingHandguns" operation="Equals" value="100"/>
 			</passive_effect>
 			
@@ -2117,7 +2117,7 @@
 			</passive_effect>
 
 			<!-- When all Pistol Pete books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="pistolPeteProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="pistolPeteProb">
 				<requirement name="ProgressionLevel" progression_name="perkPistolPeteComplete" operation="Equals" value="1"/>
 			</passive_effect>
 			
@@ -2127,7 +2127,7 @@
 			</passive_effect>
 
 			<!-- When all Magnum Enforcer books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="enforcerProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="enforcerProb">
 				<requirement name="ProgressionLevel" progression_name="perkEnforcerComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -2175,7 +2175,7 @@
 			</passive_effect>
 
 			<!-- Once blade crafting skill reaches 75, set the probability bonus of finding salvage tools crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="bladesCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="bladesCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingBlades" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -2413,7 +2413,7 @@
 			</passive_effect>
 
 			<!-- Once armor crafting skill reaches 75, set the probability bonus of finding armor crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,4" value="0,0" tags="armorCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,4" value="1,1" tags="armorCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingArmor" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -2423,7 +2423,7 @@
 			</passive_effect>
 
 			<!-- When all Needle & Thread books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,4" value="0,0" tags="needleProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,4" value="1,1" tags="needleProb">
 				<requirement name="ProgressionLevel" progression_name="perkNeedleAndThreadComplete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -2486,7 +2486,7 @@
 			</passive_effect>
 
 			<!-- When all Urban Combat books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="urbanProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="urbanProb">
 				<requirement name="ProgressionLevel" progression_name="perkUrbanCombatComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -2523,7 +2523,7 @@
 			</passive_effect>
 
 			<!-- When all Night Stalker books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="nightStalkerProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="nightStalkerProb">
 				<requirement name="ProgressionLevel" progression_name="perkNightStalkerComplete" operation="Equals" value="1"/>
 			</passive_effect>
 		</effect_group>
@@ -2553,7 +2553,7 @@
 			</passive_effect>
 
 			<!-- Once robotic crafting skill reaches 100, set the probability bonus of finding robotic crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="roboticsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="roboticsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingRobotics" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -2563,7 +2563,7 @@
 			</passive_effect>
 
 			<!-- When all Tech Junkie books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="techJunkieProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="techJunkieProb">
 				<requirement name="ProgressionLevel" progression_name="perkTechJunkie8Complete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -2631,7 +2631,7 @@
 			</passive_effect>
 
 			<!-- Once robotic crafting skill reaches 100, set the probability bonus of finding robotic crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="roboticsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="roboticsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingRobotics" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -2641,7 +2641,7 @@
 			</passive_effect>
 
 			<!-- When all Tech Junkie books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="0,0" tags="techJunkieProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,5" value="1,1" tags="techJunkieProb">
 				<requirement name="ProgressionLevel" progression_name="perkTechJunkie8Complete" operation="Equals" value="1"/>
 			</passive_effect>
 
@@ -2793,7 +2793,7 @@
 			</passive_effect>
 
 			<!-- Once medical crafting skill reaches 75, set the probability bonus of finding medical crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="medicalCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="medicalCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingMedical" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -2810,7 +2810,7 @@
 			<requirement name="HoldingItemHasTags" tags="stunBaton"/>
 			<requirement name="IsAlive" target="other"/>
 			<requirement name="EntityTagCompare" target="other" tags="zombie,animal"/>
-				<passive_effect name="EntityDamage" operation="base_add" level="5" value="1500"/>
+				<passive_effect name="EntityDamage" operation="base_add" level="5" value="1500" tags="stunBaton"/>
 		</effect_group>
 		
 	</perk>
@@ -2858,19 +2858,19 @@
 			</passive_effect>
 
 			<!-- Once electrical crafting skill reaches 100, set the probability bonus of finding electrical crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="electricianCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="electricianCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingElectrician" operation="Equals" value="100"/>
 			</passive_effect>
 			<!-- Once trap crafting skill reaches 75, set the probability bonus of finding trap crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="trapsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="trapsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingTraps" operation="Equals" value="75"/>
 			</passive_effect>
 			<!-- Once workstation crafting skill reaches 75, set the probability bonus of finding workstation crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="workstationCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="workstationCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingWorkstations" operation="Equals" value="75"/>
 			</passive_effect>
 			<!-- Once repair tool skill reaches 50, set the probability bonus of finding repair tool crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="repairToolsCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="repairToolsCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingRepairTools" operation="Equals" value="50"/>
 			</passive_effect>
 
@@ -2903,7 +2903,7 @@
 			</passive_effect>
 
 			<!-- Once vehicle crafting skill reaches 100, set the probability bonus of finding vehicle crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,5" value="0,0" tags="vehiclesCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,5" value="1,1" tags="vehiclesCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingVehicles" operation="Equals" value="100"/>
 			</passive_effect>
 
@@ -2935,7 +2935,7 @@
 			</passive_effect>
 
 			<!-- Once workstation crafting skill reaches 75, set the probability bonus of finding workstation crafting skill magazines to 0 -->
-			<passive_effect name="LootProb" operation="base_set" level="1,3" value="0,0" tags="workstationCSM">
+			<passive_effect name="LootProb" operation="base_set" level="1,3" value="1,1" tags="workstationCSM">
 				<requirement name="ProgressionLevel" progression_name="craftingWorkstations" operation="Equals" value="75"/>
 			</passive_effect>
 
@@ -2945,7 +2945,7 @@
 			</passive_effect>
 
 			<!-- When all The Great Heist books have been read, set the probability bonus of finding them to 0 -->
-			<passive_effect name="LootProb" operation="perc_add" level="1,3" value="0,0" tags="greatHeistProb">
+			<passive_effect name="LootProb" operation="perc_add" level="1,3" value="1,1" tags="greatHeistProb">
 				<requirement name="ProgressionLevel" progression_name="perkGreatHeistComplete" operation="Equals" value="1"/>
 			</passive_effect>
 
diff --git a/readme.txt b/readme.txt
index 5d0248c..dd6428d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-JaithWraith's 7DTD No Gore Mod - V1.9.1 (Alpha 21.1 Release)
+JaithWraith's 7DTD No Gore Mod - V1.9.2 (Alpha 21.2 Release)
 Author: JaithWraith
 
 For additional information, you can find this project at www.github.com/JaithWraith/7dtd_nogore.
@@ -7,11 +7,11 @@ OVERVIEW:
 This is a simple mod that tones down the gore in 7 Days to Die. If this mod isn't to your tastes, that's fine - don't use it. :) While the game still deals with mature situations and will have decaying zombies and such, this mod removes the splattering blood and dramatically reduces decapitations. Additionally, it changes the Zombie Party Girl to put some more clothes on...
 
 COMPATABILITY:
-Since this mod relies on customized entityclasses.xml, item_modifiers.xml, items.xml, and progression.xml files, it is not compatible with any mod that also modifies these files. Please keep in mind that, without the change to essentially "critical hit" a zombie and suddenly kill them, the game is noticably more difficult.
+Since this mod relies on customized entityclasses.xml, item_modifiers.xml, items.xml, and progression.xml files, it is not compatible with any mod that also modifies these files. Please keep in mind that, without the chance to essentially "critical hit" a zombie and suddenly kill them, the game is noticably more difficult.
 
 INSTRUCTIONS:
 Always begin by making a backup of your entityclasses.xml, item_modifiers.xml, items.xml, and progression.xml files! 
 
 Once the mod is extracted, copy the modified entityclasses.xml, item_modifiers.xml, items.xml, and progression.xml into the steamapps > common > 7 Days to Die > Data > Config folder and replace the existing files.
 
-v1.9.1 is compatible with the Alpha 21.1 release.
+v1.9.2 is compatible with the Alpha 21.2 release.