diff --git a/Anomaly/Defs/Ammo/Flamethrower_Burst.xml b/Anomaly/Defs/Ammo/Flamethrower_Burst.xml
index 7bad01e095..1cd0b6db8e 100644
--- a/Anomaly/Defs/Ammo/Flamethrower_Burst.xml
+++ b/Anomaly/Defs/Ammo/Flamethrower_Burst.xml
@@ -9,7 +9,7 @@
 		<ammoTypes>
 			<Ammo_Flamethrower_Napalm>Bullet_Incinerator_Burst_Napalm</Ammo_Flamethrower_Napalm>
 			<Ammo_Flamethrower_Prometheum>Bullet_Incinerator_Burst_Prometheum</Ammo_Flamethrower_Prometheum>
-			<Ammo_Flamethrower_Bioferrite>Bullet_Incinerator_Burst_Bioferrite</Ammo_Flamethrower_Bioferrite>			
+			<Ammo_Flamethrower_Bioferrite>Bullet_Incinerator_Burst_Bioferrite</Ammo_Flamethrower_Bioferrite>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
@@ -20,7 +20,7 @@
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>jellied chemfuel stream</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<pelletCount>20</pelletCount>	
+			<pelletCount>20</pelletCount>
 			<damageDef>Flame</damageDef>
 			<damageAmountBase>3</damageAmountBase>
 			<preExplosionSpawnThingDef>Filth_Fuel</preExplosionSpawnThingDef>
diff --git a/Anomaly/Defs/Ammo/NerveSpikerBolt.xml b/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
index 6afd1a590c..3e1a706b06 100644
--- a/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
+++ b/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
@@ -23,7 +23,7 @@
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
 		<defName>Ammo_NerveSpikerBolt</defName>
 		<label>nerve spiker bolt</label>
-		<description>A heavy bioferrite bolt, shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact.</description>		
+		<description>A heavy bioferrite bolt, shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact.</description>
 		<graphicData>
 			<texPath>Things/Ammo/Medieval/Bolt/Bioferrite</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -55,7 +55,7 @@
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>NerveBioferrite</damageDef>
-			<speed>34</speed>			
+			<speed>34</speed>
 			<damageAmountBase>11</damageAmountBase>
 			<armorPenetrationBlunt>10.8</armorPenetrationBlunt>
 			<armorPenetrationSharp>5</armorPenetrationSharp>
diff --git a/Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml b/Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml
index 1b31e13f71..1c53db1c6c 100644
--- a/Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml
+++ b/Anomaly/Defs/DamageDefs/DamageDefs_Anomaly.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
+	<DamageDef ParentName="Scratch">
+		<defName>DemolishScratch</defName>
+		<buildingDamageFactorImpassable>2</buildingDamageFactorImpassable>
+	</DamageDef>
+
 	<DamageDef ParentName="Nerve">
 		<defName>NerveBioferrite</defName>
 		<additionalHediffs>
diff --git a/Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml b/Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml
index 370e954b72..f868f00412 100644
--- a/Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml
+++ b/Anomaly/Defs/HediffDefs/Hediffs_Anomaly.xml
@@ -3,7 +3,7 @@
 
 	<!-- Global -->
 
- 	<!-- It would be preferable to apply the regen modifier is a factor, but that's not currently possible. -->
+	<!-- It would be preferable to apply the regen modifier is a factor, but that's not currently possible. -->
 
 	<HediffDef>
 		<defName>BioferriteToxicity</defName>
@@ -56,7 +56,7 @@
 					<IncomingDamageFactor>1.40</IncomingDamageFactor>
 				</statFactors>
 				<regeneration>-350</regeneration> <!-- Offsets impossible regeneration. -->
-			</li>			
+			</li>
 		</stages>
 	</HediffDef>
 
diff --git a/Anomaly/Defs/ToolCapacityDefs/ToolCapacity.xml b/Anomaly/Defs/ToolCapacityDefs/ToolCapacity.xml
new file mode 100644
index 0000000000..ee288442c8
--- /dev/null
+++ b/Anomaly/Defs/ToolCapacityDefs/ToolCapacity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ToolCapacityDef>
+		<defName>DemolishScratch</defName>
+		<label>scratch</label>
+	</ToolCapacityDef>
+
+</Defs>
\ No newline at end of file
diff --git a/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml b/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
index 43c7948f85..bc795283c1 100644
--- a/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
+++ b/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
@@ -39,8 +39,8 @@
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageAmountBase>11</damageAmountBase>
-				<armorPenetrationSharp>7.5</armorPenetrationSharp>
-				<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
+				<armorPenetrationSharp>12</armorPenetrationSharp>
+				<armorPenetrationBlunt>16</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>
@@ -51,7 +51,7 @@
 		<xpath>Defs/AbilityDef[defName="SpikeLaunch_Fingerspike"]/verbProperties</xpath>
 		<value>
 			<verbProperties Class="CombatExtended.VerbPropertiesCE">
-				<range>18.9</range>
+				<range>12.9</range>
 				<defaultProjectile>Spike_Fingerspike</defaultProjectile>
 			</verbProperties>
 		</value>
@@ -62,8 +62,8 @@
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageAmountBase>8</damageAmountBase>
-				<armorPenetrationSharp>3.85</armorPenetrationSharp>
-				<armorPenetrationBlunt>4.22</armorPenetrationBlunt>
+				<armorPenetrationSharp>9</armorPenetrationSharp>
+				<armorPenetrationBlunt>12</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>
@@ -73,11 +73,11 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/AbilityDef[defName="SpineLaunch_Gorehulk"]/verbProperties</xpath>
 		<value>
-			<verbProperties Class="CombatExtended.VerbPropertiesCE">		
+			<verbProperties Class="CombatExtended.VerbPropertiesCE">
 				<soundCast>Gorehulk_Spine_Launch</soundCast>
 				<range>27.9</range>
 				<defaultProjectile>Spine_Gorehulk</defaultProjectile>
-			</verbProperties>	
+			</verbProperties>
 		</value>
 	</Operation>
 
@@ -86,8 +86,8 @@
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageAmountBase>15</damageAmountBase>
-				<armorPenetrationSharp>14.75</armorPenetrationSharp>
-				<armorPenetrationBlunt>16.16</armorPenetrationBlunt>
+				<armorPenetrationSharp>6</armorPenetrationSharp>
+				<armorPenetrationBlunt>8</armorPenetrationBlunt>
 			</projectile>
 		</value>
 	</Operation>
@@ -106,25 +106,25 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/AbilityDef[defName="Heatspikes"]/verbProperties</xpath>
 		<value>
-			<verbProperties Class="CombatExtended.VerbPropertiesCE">		
+			<verbProperties Class="CombatExtended.VerbPropertiesCE">
 				<soundCast>Heatspikes_Shot</soundCast>
-				<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>				
+				<verbClass>CombatExtended.Verb_AbilityShootCE</verbClass>
 				<soundCastTail>Heatspikes_Tail</soundCastTail>
-				<range>44.9</range>
+				<range>44</range>
 				<defaultProjectile>Bullet_Heatspike</defaultProjectile>
 				<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
 				<warmupTime>0</warmupTime>
-				<burstShotCount>12</burstShotCount>
+				<burstShotCount>10</burstShotCount>
 				<stopBurstWithoutLos>false</stopBurstWithoutLos>
 				<recoilAmount>3</recoilAmount> <!-- Abilities can't use ShotSpread, so give high recoil. -->
-			</verbProperties>	
+			</verbProperties>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Bullet_Heatspike"]/projectile</xpath>
 		<value>
-			<thingClass>CombatExtended.BulletCE</thingClass>	
+			<thingClass>CombatExtended.BulletCE</thingClass>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<damageDef>EnergyBolt</damageDef>
 				<damageAmountBase>18</damageAmountBase>
@@ -141,7 +141,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/AbilityDef[defName="FleshmelterBolt"]/verbProperties/range</xpath>
 		<value>
-			<range>44.9</range>
+			<range>44</range>
 		</value>
 	</Operation>
 
diff --git a/Anomaly/Patches/Bodies/Devourer.xml b/Anomaly/Patches/Bodies/Devourer.xml
index 6591b4702d..1ea3556f58 100644
--- a/Anomaly/Patches/Bodies/Devourer.xml
+++ b/Anomaly/Patches/Bodies/Devourer.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Fin"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -78,6 +78,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/BodyDef[defName="Devourer"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]/groups</xpath>
 		<value>
diff --git a/Anomaly/Patches/Bodies/Dreadmeld.xml b/Anomaly/Patches/Bodies/Dreadmeld.xml
index 8514084523..7793d16b2c 100644
--- a/Anomaly/Patches/Bodies/Dreadmeld.xml
+++ b/Anomaly/Patches/Bodies/Dreadmeld.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart/parts/li[def="Tentacle"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart/parts/li[def="FleshbeastHead"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Dreadmeld"]/corePart/parts/li[def="FleshbeastHead"]/parts/li[def="FleshbeastSpike"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Fingerspike.xml b/Anomaly/Patches/Bodies/Fingerspike.xml
index 1b3f77934a..8fd48957cc 100644
--- a/Anomaly/Patches/Bodies/Fingerspike.xml
+++ b/Anomaly/Patches/Bodies/Fingerspike.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Spine"]/parts/li[def="FleshbeastSpike"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]/parts/li[def="Jaw"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -60,7 +60,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="Shoulder"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -70,7 +70,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Fingerspike"]/corePart/parts/li[def="FleshbeastLeg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Fleshbulb.xml b/Anomaly/Patches/Bodies/Fleshbulb.xml
index 5bba596b55..9751a5af9f 100644
--- a/Anomaly/Patches/Bodies/Fleshbulb.xml
+++ b/Anomaly/Patches/Bodies/Fleshbulb.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Bulbfreak"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Bulbfreak"]/corePart/parts/li[def="FleshbeastHead"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Bulbfreak"]/corePart/parts/li[def="FleshbeastHead"]/parts/li[def="Tentacle"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/FleshmassNucleus.xml b/Anomaly/Patches/Bodies/FleshmassNucleus.xml
index 940baa3ef8..5b8637bf90 100644
--- a/Anomaly/Patches/Bodies/FleshmassNucleus.xml
+++ b/Anomaly/Patches/Bodies/FleshmassNucleus.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="FleshmassNucleus"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Gorehulk.xml b/Anomaly/Patches/Bodies/Gorehulk.xml
index 655474bb88..c750e7b047 100644
--- a/Anomaly/Patches/Bodies/Gorehulk.xml
+++ b/Anomaly/Patches/Bodies/Gorehulk.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="SpineLauncher_Gorehulk"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Jaw"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -60,7 +60,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Leg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -70,7 +70,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Shoulder"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -80,7 +80,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Shoulder"]/parts/li[def="FleshClub_Gorehulk"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -90,7 +90,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Shoulder"]/parts/li[def="SpineLauncher_Gorehulk"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -100,7 +100,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Leg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -110,7 +110,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -120,7 +120,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Gorehulk"]/corePart/parts/li[def="Leg"]/parts/li[def="Foot"]/parts/li[def="Toe"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -195,6 +195,6 @@
 		<value>
 			<li>CoveredByNaturalArmor</li>
 		</value>
-	</Operation>	
+	</Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/Anomaly/Patches/Bodies/Metalhorror.xml b/Anomaly/Patches/Bodies/Metalhorror.xml
index b3d0e9f081..9510ef5411 100644
--- a/Anomaly/Patches/Bodies/Metalhorror.xml
+++ b/Anomaly/Patches/Bodies/Metalhorror.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorNeck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorNeck"]/parts/li[def="MetalhorrorHead"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorShoulder"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorShoulder"]/parts/li[def="MetalhorrorArm"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -60,18 +60,17 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorShoulder"]/parts/li[def="MetalhorrorArm"]/parts/li[def="MetalhorrorBlade"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
-	</Operation>	
+	</Operation>
 
-	
 	<Operation Class="PatchOperationConditional">
 		<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorLeg"]/groups</xpath>
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorLeg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -81,7 +80,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Metalhorror"]/corePart/parts/li[def="MetalhorrorLeg"]/parts/li[def="MetalhorrorFoot"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Nociosphere.xml b/Anomaly/Patches/Bodies/Nociosphere.xml
index 8877711c94..2e73ef8af1 100644
--- a/Anomaly/Patches/Bodies/Nociosphere.xml
+++ b/Anomaly/Patches/Bodies/Nociosphere.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Nociosphere"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Nociosphere"]/corePart/parts/li[def="ShellSection"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Noctol.xml b/Anomaly/Patches/Bodies/Noctol.xml
index 5b87d87a54..7444b2502c 100644
--- a/Anomaly/Patches/Bodies/Noctol.xml
+++ b/Anomaly/Patches/Bodies/Noctol.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Nose"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -60,7 +60,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Ear"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -70,7 +70,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Leg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -80,7 +80,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Noctol"]/corePart/parts/li[def="Leg"]/parts/li[def="NoctolClaw"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Toughspike.xml b/Anomaly/Patches/Bodies/Toughspike.xml
index 5850665483..718e54fa93 100644
--- a/Anomaly/Patches/Bodies/Toughspike.xml
+++ b/Anomaly/Patches/Bodies/Toughspike.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]/parts/li[def="Jaw"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart/parts/li[def="Shoulder"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -60,7 +60,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart/parts/li[def="Shoulder"]/parts/li[def="FleshbeastSpike"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -70,7 +70,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Toughspike"]/corePart/parts/li[def="FleshbeastLeg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Bodies/Trispike.xml b/Anomaly/Patches/Bodies/Trispike.xml
index 91ccf1345e..dd711a3a61 100644
--- a/Anomaly/Patches/Bodies/Trispike.xml
+++ b/Anomaly/Patches/Bodies/Trispike.xml
@@ -10,7 +10,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -20,7 +20,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="Spine"]/parts/li[def="FleshbeastSpike"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -30,7 +30,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="Neck"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -40,7 +40,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -50,7 +50,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="Neck"]/parts/li[def="FleshbeastHead"]/parts/li[def="Jaw"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -60,7 +60,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="Shoulder"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -70,7 +70,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="Shoulder"]/parts/li[def="FleshbeastSpike"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
@@ -80,7 +80,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/BodyDef[defName="Trispike"]/corePart/parts/li[def="FleshbeastLeg"]</xpath>
 			<value>
-				<groups/>
+				<groups />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml b/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml
index 3f8834e43c..bf2e68b94a 100644
--- a/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml
+++ b/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml
@@ -21,4 +21,29 @@
 		</value>
 	</Operation>
 
+	<!-- ========== Ghoul implants ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="GhoulPlating"]/stages/li/statFactors/IncomingDamageFactor</xpath>
+		<value>
+			<IncomingDamageFactor>0.25</IncomingDamageFactor>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GhoulPlating"]/stages/li/statOffsets</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="GhoulBarbs"]/stages/li/statOffsets</xpath>
+		<value>
+			<ArmorRating_Sharp>1</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
 </Patch>
\ No newline at end of file
diff --git a/Anomaly/Patches/Hediffs/Hediffs_Mutants.xml b/Anomaly/Patches/Hediffs/Hediffs_Mutants.xml
index a80ec57d6e..4bf3b9c85a 100644
--- a/Anomaly/Patches/Hediffs/Hediffs_Mutants.xml
+++ b/Anomaly/Patches/Hediffs/Hediffs_Mutants.xml
@@ -18,6 +18,8 @@
 		<xpath>Defs/HediffDef[defName="Ghoul"]/stages/li/statFactors</xpath>
 		<value>
 			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<IncomingDamageFactor>0.75</IncomingDamageFactor>
 		</value>
 	</Operation>
 
diff --git a/Anomaly/Patches/Misc/Mutants.xml b/Anomaly/Patches/Misc/Mutants.xml
index 0591d11c62..ac796f463a 100644
--- a/Anomaly/Patches/Misc/Mutants.xml
+++ b/Anomaly/Patches/Misc/Mutants.xml
@@ -6,46 +6,46 @@
 		<xpath>Defs/MutantDef[defName="Shambler"]/tools</xpath>
 		<value>
 			<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>teeth</label>
-				<capacities>
-					<li>Bite</li>
-				</capacities>
-				<power>8.2</power>
-				<cooldownTime>2</cooldownTime>
-				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-				<chanceFactor>1</chanceFactor>
-				<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-				<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-				<armorPenetrationSharp>0.15</armorPenetrationSharp>
-				<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>left hand</label>
-				<capacities>
-					<li>Scratch</li>
-				</capacities>
-				<power>7</power>
-				<cooldownTime>2</cooldownTime>
-				<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-				<chanceFactor>1.5</chanceFactor>
-				<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.6</armorPenetrationSharp>
-				<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>right hand</label>
-				<capacities>
-					<li>Scratch</li>
-				</capacities>
-				<power>7</power>
-				<cooldownTime>2</cooldownTime>
-				<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-				<chanceFactor>1.5</chanceFactor>
-				<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.6</armorPenetrationSharp>
-				<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-			</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8.2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>1</chanceFactor>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>DemolishScratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>DemolishScratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
 			</tools>
 		</value>
 	</Operation>
@@ -55,50 +55,50 @@
 		<xpath>Defs/MutantDef[defName="Ghoul"]/tools</xpath>
 		<value>
 			<tools>
-			<li Class="CombatExtended.ToolCE">
-				<label>teeth</label>
-				<capacities>
-					<li>Bite</li>
-				</capacities>
-				<power>8.2</power>
-				<cooldownTime>2</cooldownTime>
-				<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
-				<chanceFactor>0.5</chanceFactor>
-				<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
-				<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
-				<armorPenetrationSharp>0.15</armorPenetrationSharp>
-				<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>left claw</label>
-				<capacities>
-					<li>Scratch</li>
-				</capacities>
-				<power>7</power>
-				<cooldownTime>2</cooldownTime>
-				<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-				<chanceFactor>1.5</chanceFactor>
-				<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.6</armorPenetrationSharp>
-				<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-				<soundMeleeHit>Pawn_Ghoul_Scratch</soundMeleeHit>
-				<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
-			</li>
-			<li Class="CombatExtended.ToolCE">
-				<label>right claw</label>
-				<capacities>
-					<li>Scratch</li>
-				</capacities>
-				<power>7</power>
-				<cooldownTime>2</cooldownTime>
-				<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-				<chanceFactor>1.5</chanceFactor>
-				<armorPenetrationBlunt>1.2</armorPenetrationBlunt>
-				<armorPenetrationSharp>0.6</armorPenetrationSharp>
-				<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-				<soundMeleeHit>Pawn_Ghoul_Scratch</soundMeleeHit>
-				<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
-			</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>teeth</label>
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>8.2</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<chanceFactor>0.5</chanceFactor>
+					<soundMeleeHit>Pawn_Melee_HumanBite_Hit</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_HumanBite_Miss</soundMeleeMiss>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>Pawn_Ghoul_Scratch</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>2</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+					<soundMeleeHit>Pawn_Ghoul_Scratch</soundMeleeHit>
+					<soundMeleeMiss>Pawn_Melee_SmallScratch_Miss</soundMeleeMiss>
+				</li>
 			</tools>
 		</value>
 	</Operation>
diff --git a/Anomaly/Patches/ThingDefs_Buildings/Buildings_Obelisks.xml b/Anomaly/Patches/ThingDefs_Buildings/Buildings_Obelisks.xml
new file mode 100644
index 0000000000..95953207f5
--- /dev/null
+++ b/Anomaly/Patches/ThingDefs_Buildings/Buildings_Obelisks.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Base Obelisk damage resistance ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="WarpedObelisk"]</xpath>
+		<value>
+			<damageMultipliers>
+				<li>
+					<damageDef>Bomb</damageDef>
+					<multiplier>0.5</multiplier>
+				</li>
+				<li>
+					<damageDef>Thermobaric</damageDef>
+					<multiplier>0.5</multiplier>
+				</li>
+				<li>
+					<damageDef>Bomb_Secondary</damageDef>
+					<multiplier>0.5</multiplier>
+				</li>
+				<li>
+					<damageDef>Demolish</damageDef>
+					<multiplier>0.5</multiplier>
+				</li>
+				<li>
+					<damageDef>Thump</damageDef>
+					<multiplier>0.5</multiplier>
+				</li>
+			</damageMultipliers>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/Anomaly/Patches/ThingDefs_Misc/Apparel_Anomaly.xml b/Anomaly/Patches/ThingDefs_Misc/Apparel_Anomaly.xml
index 8a7b79c4ca..93304fa8db 100644
--- a/Anomaly/Patches/ThingDefs_Misc/Apparel_Anomaly.xml
+++ b/Anomaly/Patches/ThingDefs_Misc/Apparel_Anomaly.xml
@@ -42,7 +42,7 @@
 		</value>
 	</Operation>
 
-	 <!-- Approximate Bioferrite mask covering the face. -->
+	<!-- Approximate Bioferrite mask covering the face. -->
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="Apparel_CeremonialCultistMask"]</xpath>
 		<value>
@@ -53,7 +53,7 @@
 						<parts>
 							<li>Eye</li>
 							<li>Nose</li>
-							<li>Jaw</li>							
+							<li>Jaw</li>
 						</parts>
 					</li>
 					<li>
diff --git a/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml b/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml
index fbc286ff18..26fac4a7a2 100644
--- a/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml
+++ b/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml
@@ -2,7 +2,7 @@
 <Patch>
 
 	<!-- ========== Disruptor Flare Pack ========== -->
-  
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Apparel_DisruptorFlarePack"]/statBases</xpath>
 		<value>
@@ -18,10 +18,10 @@
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
 					<defaultProjectile>Grenade_DisruptorFlare</defaultProjectile>
-          			<label>deploy flare</label>
+					<label>deploy flare</label>
 					<warmupTime>0.5</warmupTime>
 					<range>40</range>
-          			<burstShotCount>1</burstShotCount>
+					<burstShotCount>1</burstShotCount>
 					<onlyManualCast>true</onlyManualCast>
 					<hasStandardCommand>true</hasStandardCommand>
 					<targetable>true</targetable>
@@ -33,8 +33,8 @@
 					</targetParams>
 					<soundCast>FlareLaunch</soundCast>
 					<rangedFireRulepack>Combat_RangedFire_Thrown</rangedFireRulepack>
-          			<canGoWild>false</canGoWild>
-          			<explosionRadiusRingColor>(0.8, 0.8, 0.4, 1)</explosionRadiusRingColor><!-- Keep in sync with PlaceWorker_GlowRadius.RingColor -->
+					<canGoWild>false</canGoWild>
+					<explosionRadiusRingColor>(0.8, 0.8, 0.4, 1)</explosionRadiusRingColor><!-- Keep in sync with PlaceWorker_GlowRadius.RingColor -->
 					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
 					<drawHighlightWithLineOfSight>true</drawHighlightWithLineOfSight>
 				</li>
@@ -43,7 +43,7 @@
 	</Operation>
 
 	<!--Projectile-->
-	
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Grenade_DisruptorFlare"]/thingClass</xpath>
 		<value>
@@ -54,16 +54,16 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Grenade_DisruptorFlare"]/projectile</xpath>
 		<value>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<dropsCasings>false</dropsCasings>
-			<dangerFactor>0</dangerFactor>
-			<airborneSuppressionFactor>0</airborneSuppressionFactor>
-			<speed>12</speed>
-			<spinRate>3</spinRate>
-			<!--<explosionRadius>7.9</explosionRadius> --><!-- Must be kept in sync with radius of CompProperties_DisruptorFlare -->
-			<landedEffecter>DisruptorFlareLanded</landedEffecter>
-			<spawnsThingDef>DisruptorFlare</spawnsThingDef>
-		</projectile>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<dropsCasings>false</dropsCasings>
+				<dangerFactor>0</dangerFactor>
+				<airborneSuppressionFactor>0</airborneSuppressionFactor>
+				<speed>12</speed>
+				<spinRate>3</spinRate>
+				<!--<explosionRadius>7.9</explosionRadius> --><!-- Must be kept in sync with radius of CompProperties_DisruptorFlare -->
+				<landedEffecter>DisruptorFlareLanded</landedEffecter>
+				<spawnsThingDef>DisruptorFlare</spawnsThingDef>
+			</projectile>
 		</value>
 	</Operation>
 
@@ -83,7 +83,7 @@
 			<verbs>
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<label>deploy turret</label>
-      				<verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
+					<verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
 					<onlyManualCast>True</onlyManualCast>
 					<warmupTime>1</warmupTime>
@@ -137,7 +137,7 @@
 			<verbs>
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<label>deploy deadlife dust</label>
-      				<verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
+					<verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
 					<onlyManualCast>True</onlyManualCast>
 					<warmupTime>1.5</warmupTime>
@@ -172,7 +172,7 @@
 				<damageAmountBase>0</damageAmountBase>
 				<speed>12</speed>
 				<soundExplode>ToxicShellLanded</soundExplode>
-				<postExplosionSpawnThingDef>Shell_Deadlife_Releasing</postExplosionSpawnThingDef>				
+				<postExplosionSpawnThingDef>Shell_Deadlife_Releasing</postExplosionSpawnThingDef>
 			</projectile>
 		</value>
 	</Operation>
diff --git a/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml b/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml
index d34112e356..ecff3d999f 100644
--- a/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml
+++ b/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml
@@ -85,7 +85,7 @@
 		</FireModes>
 		<weaponTags>
 			<li>IndustrialGunAdvanced</li>
-			<li>AssaultRifle</li>		
+			<li>AssaultRifle</li>
 			<li>CE_AI_Rifle</li>
 		</weaponTags>
 	</Operation>
@@ -101,7 +101,7 @@
 					<reloadTime>5</reloadTime>
 					<ammoSet>AmmoSet_Flamethrower</ammoSet>
 				</propsUnderBarrel>
-					<verbPropsUnderBarrel>
+				<verbPropsUnderBarrel>
 					<recoilAmount>0.35</recoilAmount>
 					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
@@ -122,7 +122,7 @@
 					<aiUseBurstMode>FALSE</aiUseBurstMode>
 					<aiAimMode>AimedShot</aiAimMode>
 					<aimedBurstShotCount>5</aimedBurstShotCount>
-					<noSingleShot>true</noSingleShot>	
+					<noSingleShot>true</noSingleShot>
 				</propsFireModesUnderBarrel>
 			</li>
 			<li>
@@ -131,12 +131,12 @@
 		</value>
 	</Operation>
 
-	<!-- ========== Incinerator ========== -->	
+	<!-- ========== Incinerator ========== -->
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Gun_Incinerator"]/description</xpath>
 		<value>
-    		<description>A heavy weapon with a hardened bioferrite housing that can spray a stream of flame into an area.\n\nThe weapon also comes equipped with a pressure control module, allowing the wielder to set a small area ablaze with a concentrated spray of fuel.</description>
+			<description>A heavy weapon with a hardened bioferrite housing that can spray a stream of flame into an area.\n\nThe weapon also comes equipped with a pressure control module, allowing the wielder to set a small area ablaze with a concentrated spray of fuel.</description>
 		</value>
 	</Operation>
 
@@ -203,7 +203,7 @@
 				<aiUseBurstMode>true</aiUseBurstMode>
 				<aimedBurstShotCount>10</aimedBurstShotCount>
 				<aiAimMode>SuppressFire</aiAimMode>
-			</li>	
+			</li>
 		</value>
 	</Operation>
 
@@ -237,7 +237,7 @@
 				</verbPropsUnderBarrel>
 				<propsFireModesUnderBarrel>
 					<aiAimMode>AimedShot</aiAimMode>
-					<noSingleShot>true</noSingleShot>	
+					<noSingleShot>true</noSingleShot>
 				</propsFireModesUnderBarrel>
 			</li>
 			<li>
diff --git a/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml b/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml
index c398e572d6..425c982327 100644
--- a/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml
+++ b/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml
@@ -14,11 +14,11 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[@Name="MysteriousSphereEntityBase"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>0.5</MeleeCritChance>
-			<MeleeParryChance>0</MeleeParryChance>
-			<AimingAccuracy>1</AimingAccuracy>
-			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
+			<MeleeDodgeChance>0.03</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
+			<AimingAccuracy>1.7</AimingAccuracy>
+			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
 		</value>
 	</Operation>
 
@@ -32,7 +32,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[@Name="MysteriousSphereEntityBase"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
-			<ArmorRating_Blunt>40</ArmorRating_Blunt>
+			<ArmorRating_Blunt>60</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
@@ -40,11 +40,11 @@
 		<xpath>Defs/ThingDef[@Name="MysteriousSphereEntityBase"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_ArmorDurability">
-				<Durability>5000</Durability>
+				<Durability>6800</Durability>
 				<Regenerates>true</Regenerates>
 				<RegenInterval>600</RegenInterval>
 				<RegenValue>50</RegenValue>
-				<MinArmorPct>0.75</MinArmorPct>
+				<MinArmorPct>0.5</MinArmorPct>
 			</li>
 		</value>
 	</Operation>
@@ -62,9 +62,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Nociosphere"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>0.5</MeleeCritChance>
-			<MeleeParryChance>0</MeleeParryChance>
+			<MeleeDodgeChance>0.33</MeleeDodgeChance>
+			<MeleeCritChance>0.26</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -91,9 +91,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Metalhorror"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1.2</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>0.8</MeleeParryChance>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.12</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -111,13 +111,27 @@
 		</value>
 	</Operation>
 
-	<!-- Vanilla attack stats are identical to the Scyther.-->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Metalhorror"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>800</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>50</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Vanilla attack stats are identical to the Scyther, slightly tweaked -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Metalhorror"]/tools</xpath>
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left blade</label>
+					<labelNoLocation>blade</labelNoLocation>
 					<capacities>
 						<li>Cut</li>
 					</capacities>
@@ -130,18 +144,20 @@
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>left blade</label>
+					<labelNoLocation>blade</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
 					<power>24</power>
 					<cooldownTime>1.33</cooldownTime>
 					<linkedBodyPartsGroup>LeftBlade</linkedBodyPartsGroup>
-					<armorPenetrationSharp>40</armorPenetrationSharp>
-					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right blade</label>
+					<labelNoLocation>blade</labelNoLocation>
 					<capacities>
 						<li>Cut</li>
 					</capacities>
@@ -154,14 +170,15 @@
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right blade</label>
+					<labelNoLocation>blade</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
 					<power>24</power>
 					<cooldownTime>1.33</cooldownTime>
 					<linkedBodyPartsGroup>RightBlade</linkedBodyPartsGroup>
-					<armorPenetrationSharp>40</armorPenetrationSharp>
-					<armorPenetrationBlunt>20</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
 				</li>
 				<li Class="CombatExtended.ToolCE">
@@ -179,6 +196,49 @@
 		</value>
 	</Operation>
 
+	<!-- ========== Revenant ========== -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="Revenant"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Revenant"]/statBases</xpath>
+		<value>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<ArmorRating_Heat>0.25</ArmorRating_Heat>
+			<ArmorRating_Electric>0.5</ArmorRating_Electric>
+			<MeleeDodgeChance>0.09</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<!-- Never used, will patch just in case -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Revenant"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.9</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<chanceFactor>0.2</chanceFactor>
+					<armorPenetrationBlunt>1.875</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
 	<!-- ========== Sightstealer ========== -->
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="Sightstealer"]</xpath>
@@ -192,9 +252,12 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Sightstealer"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+			<PainShockThreshold>90</PainShockThreshold>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.08</MeleeCritChance>
+			<MeleeParryChance>0.06</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -204,6 +267,49 @@
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left claw</label>
+					<labelNoLocation>claw</labelNoLocation>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.9</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<labelNoLocation>claw</labelNoLocation>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.41</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>7</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
+					<armorPenetrationSharp>7.2</armorPenetrationSharp>
+					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Scratch</li>
 					</capacities>
@@ -218,12 +324,13 @@
 							</li>
 						</extraMeleeDamages>
 					</surpriseAttack>
-					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>4.9</armorPenetrationSharp>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Scratch</li>
 					</capacities>
@@ -238,8 +345,8 @@
 							</li>
 						</extraMeleeDamages>
 					</surpriseAttack>
-					<armorPenetrationBlunt>2.4</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.2</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>2.4</armorPenetrationSharp>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
 				</li>
 				<li Class="CombatExtended.ToolCE">
@@ -270,9 +377,10 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Noctol"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<PainShockThreshold>90</PainShockThreshold>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -286,7 +394,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Noctol"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
-			<ArmorRating_Blunt>7</ArmorRating_Blunt>
+			<ArmorRating_Blunt>10.5</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
@@ -296,47 +404,53 @@
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
-					<power>10</power>
+					<power>12</power>
 					<cooldownTime>1.34</cooldownTime>
 					<linkedBodyPartsGroup>FrontLeftClaw</linkedBodyPartsGroup>
-					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
 					<armorPenetrationBlunt>20</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
-					<power>10</power>
+					<power>12</power>
 					<cooldownTime>1.34</cooldownTime>
 					<linkedBodyPartsGroup>FrontRightClaw</linkedBodyPartsGroup>
-					<armorPenetrationSharp>18</armorPenetrationSharp>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
 					<armorPenetrationBlunt>20</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>left claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Scratch</li>
 					</capacities>
-					<power>13</power>
+					<power>16</power>
 					<cooldownTime>0.9</cooldownTime>
 					<linkedBodyPartsGroup>FrontLeftClaw</linkedBodyPartsGroup>
-					<armorPenetrationSharp>1.5</armorPenetrationSharp>
-					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Scratch</li>
 					</capacities>
-					<power>13</power>
+					<power>16</power>
 					<cooldownTime>0.9</cooldownTime>
 					<linkedBodyPartsGroup>FrontRightClaw</linkedBodyPartsGroup>
-					<armorPenetrationSharp>1.5</armorPenetrationSharp>
-					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>12</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<capacities>
@@ -369,11 +483,11 @@
 		<xpath>Defs/ThingDef[defName="Noctol"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_ArmorDurability">
-				<Durability>1162</Durability>
+				<Durability>625</Durability>
 				<Regenerates>true</Regenerates>
 				<RegenInterval>600</RegenInterval>
-				<RegenValue>5</RegenValue>
-				<MinArmorPct>0.75</MinArmorPct>
+				<RegenValue>25</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct>
 			</li>
 		</value>
 	</Operation>
@@ -391,9 +505,10 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Gorehulk"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>0.8</MeleeDodgeChance>
-			<MeleeCritChance>0.65</MeleeCritChance>
-			<MeleeParryChance>0.1</MeleeParryChance>
+			<PainShockThreshold>90</PainShockThreshold>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.07</MeleeCritChance>
+			<MeleeParryChance>0.14</MeleeParryChance>
 			<AimingAccuracy>1</AimingAccuracy>
 			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
 		</value>
@@ -402,7 +517,7 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Gorehulk"]/statBases</xpath>
 		<value>
-			<ArmorRating_Sharp>0.45</ArmorRating_Sharp>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
 			<ArmorRating_Blunt>4</ArmorRating_Blunt>
 		</value>
 	</Operation>
@@ -413,6 +528,7 @@
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left flesh club</label>
+					<labelNoLocation>flesh club</labelNoLocation>
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
@@ -424,13 +540,14 @@
 							<amount>8</amount>
 							<chance>0.15</chance>
 						</li>
-					</extraMeleeDamages>					
+					</extraMeleeDamages>
 					<linkedBodyPartsGroup>LeftFleshClub</linkedBodyPartsGroup>
 					<armorPenetrationBlunt>18</armorPenetrationBlunt>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right flesh club</label>
+					<labelNoLocation>flesh club</labelNoLocation>
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
@@ -442,7 +559,7 @@
 							<amount>8</amount>
 							<chance>0.15</chance>
 						</li>
-					</extraMeleeDamages>					
+					</extraMeleeDamages>
 					<linkedBodyPartsGroup>RightFleshClub</linkedBodyPartsGroup>
 					<armorPenetrationBlunt>18</armorPenetrationBlunt>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
@@ -467,11 +584,11 @@
 		<xpath>Defs/ThingDef[defName="Gorehulk"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_ArmorDurability">
-				<Durability>800</Durability>
+				<Durability>812</Durability>
 				<Regenerates>true</Regenerates>
 				<RegenInterval>600</RegenInterval>
-				<RegenValue>5</RegenValue>
-				<MinArmorPct>0.75</MinArmorPct>
+				<RegenValue>25</RegenValue>
+				<MinArmorPct>0.25</MinArmorPct>
 			</li>
 		</value>
 	</Operation>
@@ -489,9 +606,10 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Devourer"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>0.26</MeleeDodgeChance>
-			<MeleeCritChance>0.33</MeleeCritChance>
-			<MeleeParryChance>0.22</MeleeParryChance>
+			<PainShockThreshold>90</PainShockThreshold>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.46</MeleeCritChance>
+			<MeleeParryChance>0.51</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -515,6 +633,7 @@
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left fin</label>
+					<labelNoLocation>fin</labelNoLocation>
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
@@ -526,6 +645,7 @@
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right fin</label>
+					<labelNoLocation>fin</labelNoLocation>
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
@@ -538,12 +658,12 @@
 				<li Class="CombatExtended.ToolCE">
 					<label>teeth</label>
 					<capacities>
-						<li>Bite</li>
+						<li>Blunt</li>
 					</capacities>
 					<power>33</power>
 					<cooldownTime>2.0</cooldownTime>
 					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
 					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
 				</li>
 			</tools>
@@ -554,11 +674,11 @@
 		<xpath>Defs/ThingDef[defName="Devourer"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_ArmorDurability">
-				<Durability>1162</Durability>
+				<Durability>2800</Durability>
 				<Regenerates>true</Regenerates>
 				<RegenInterval>600</RegenInterval>
-				<RegenValue>5</RegenValue>
-				<MinArmorPct>0.75</MinArmorPct>
+				<RegenValue>10</RegenValue>
+				<MinArmorPct>0.25</MinArmorPct>
 			</li>
 		</value>
 	</Operation>
@@ -576,9 +696,13 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Chimera"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>0.19</MeleeDodgeChance>
-			<MeleeCritChance>0.43</MeleeCritChance>
-			<MeleeParryChance>0.22</MeleeParryChance>
+			<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
+			<ArmorRating_Blunt>5</ArmorRating_Blunt>
+			<IncomingDamageFactor>0.7</IncomingDamageFactor>
+			<PainShockThreshold>90</PainShockThreshold>
+			<MeleeDodgeChance>0.06</MeleeDodgeChance>
+			<MeleeCritChance>0.11</MeleeCritChance>
+			<MeleeParryChance>0.23</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -589,13 +713,14 @@
 		</value>
 	</Operation>
 
-	<!-- Similar to the grizzly bear, slightly higher AP. -->
+	<!-- Similar to the grizzly bear, higher AP -->
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Chimera"]/tools</xpath>
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Scratch</li>
 					</capacities>
@@ -610,11 +735,12 @@
 							</li>
 						</extraMeleeDamages>
 					</surpriseAttack>
-					<armorPenetrationSharp>1.6</armorPenetrationSharp>
-					<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>16.4</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right claw</label>
+					<labelNoLocation>claw</labelNoLocation>
 					<capacities>
 						<li>Scratch</li>
 					</capacities>
@@ -629,8 +755,8 @@
 							</li>
 						</extraMeleeDamages>
 					</surpriseAttack>
-					<armorPenetrationSharp>1.6</armorPenetrationSharp>
-					<armorPenetrationBlunt>8.2</armorPenetrationBlunt>
+					<armorPenetrationSharp>6.75</armorPenetrationSharp>
+					<armorPenetrationBlunt>16.4</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<capacities>
@@ -648,7 +774,7 @@
 						</extraMeleeDamages>
 					</surpriseAttack>
 					<chanceFactor>0.5</chanceFactor>
-					<armorPenetrationSharp>5.65</armorPenetrationSharp>
+					<armorPenetrationSharp>9.0</armorPenetrationSharp>
 					<armorPenetrationBlunt>14.5</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
diff --git a/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml b/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml
index 14eefd5674..9b688c5ac0 100644
--- a/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml
+++ b/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[@Name="BaseFleshbeast"]/statBases</xpath>
+		<value>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<PainShockThreshold>99</PainShockThreshold>
+		</value>
+	</Operation>
+
 	<!-- ========== Bulbfreak ========== -->
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="Bulbfreak"]</xpath>
@@ -14,9 +22,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Bulbfreak"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.05</MeleeDodgeChance>
+			<MeleeCritChance>0.74</MeleeCritChance>
+			<MeleeParryChance>0.57</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -83,7 +91,7 @@
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
 					<linkedBodyPartsGroup>FifthTentacle</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>
-				</li>				
+				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>head</label>
 					<capacities>
@@ -112,9 +120,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Toughspike"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.11</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
 			<AimingAccuracy>1.5</AimingAccuracy>
 			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
 		</value>
@@ -145,8 +153,8 @@
 					</capacities>
 					<power>6.3</power>
 					<cooldownTime>1.2</cooldownTime>
-					<armorPenetrationBlunt>2.82</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
 					<linkedBodyPartsGroup>LeftSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Spike</soundMeleeHit>
 				</li>
@@ -157,8 +165,8 @@
 					</capacities>
 					<power>6.3</power>
 					<cooldownTime>1.2</cooldownTime>
-					<armorPenetrationBlunt>2.82</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+					<armorPenetrationSharp>10</armorPenetrationSharp>
 					<linkedBodyPartsGroup>RightSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Spike</soundMeleeHit>
 				</li>
@@ -173,12 +181,25 @@
 					<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
 					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
 					<chanceFactor>0.2</chanceFactor>
-					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>					
+					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>
 				</li>
 			</tools>
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Toughspike"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>10</RegenValue>
+				<MinArmorPct>0.25</MinArmorPct>
+			</li>
+		</value>
+	</Operation>
+
 	<!-- ========== Trispike ========== -->
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/ThingDef[defName="Trispike"]</xpath>
@@ -192,9 +213,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Trispike"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.09</MeleeCritChance>
+			<MeleeParryChance>0.08</MeleeParryChance>
 			<AimingAccuracy>1.5</AimingAccuracy>
 			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
 		</value>
@@ -211,8 +232,8 @@
 					</capacities>
 					<power>6.3</power>
 					<cooldownTime>1.2</cooldownTime>
-					<armorPenetrationBlunt>2.82</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
 					<linkedBodyPartsGroup>MiddleSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Spike</soundMeleeHit>
 				</li>
@@ -223,8 +244,8 @@
 					</capacities>
 					<power>6.3</power>
 					<cooldownTime>1.2</cooldownTime>
-					<armorPenetrationBlunt>2.82</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
 					<linkedBodyPartsGroup>LeftSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Spike</soundMeleeHit>
 				</li>
@@ -235,8 +256,8 @@
 					</capacities>
 					<power>6.3</power>
 					<cooldownTime>1.2</cooldownTime>
-					<armorPenetrationBlunt>2.82</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
 					<linkedBodyPartsGroup>RightSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Spike</soundMeleeHit>
 				</li>
@@ -251,7 +272,7 @@
 					<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
 					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
 					<chanceFactor>0.2</chanceFactor>
-					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>					
+					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>
 				</li>
 			</tools>
 		</value>
@@ -270,9 +291,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Fingerspike"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.14</MeleeDodgeChance>
+			<MeleeCritChance>0.06</MeleeCritChance>
+			<MeleeParryChance>0.05</MeleeParryChance>
 			<AimingAccuracy>1.5</AimingAccuracy>
 			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
 		</value>
@@ -283,15 +304,15 @@
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
-					<label>right spike</label>
+					<label>spike</label>
 					<labelNoLocation>spike</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
 					<power>6.3</power>
 					<cooldownTime>1.2</cooldownTime>
-					<armorPenetrationBlunt>2.82</armorPenetrationBlunt>
-					<armorPenetrationSharp>1.64</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
 					<linkedBodyPartsGroup>MiddleSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Fleshbeast_Attack_Spike</soundMeleeHit>
 				</li>
@@ -306,7 +327,7 @@
 					<armorPenetrationBlunt>0.875</armorPenetrationBlunt>
 					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
 					<chanceFactor>0.2</chanceFactor>
-					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>					
+					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>
 				</li>
 			</tools>
 		</value>
@@ -325,9 +346,9 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Dreadmeld"]/statBases</xpath>
 		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeDodgeChance>0.02</MeleeDodgeChance>
+			<MeleeCritChance>0.16</MeleeCritChance>
+			<MeleeParryChance>0.64</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -337,25 +358,27 @@
 			<tools>
 				<li Class="CombatExtended.ToolCE">
 					<label>left spike</label>
+					<labelNoLocation>spike</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
 					<power>17.2</power>
 					<cooldownTime>1.8</cooldownTime>
-					<armorPenetrationBlunt>7.1</armorPenetrationBlunt>
-					<armorPenetrationSharp>4.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
 					<linkedBodyPartsGroup>LeftSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Dreadmeld_Attack_Spike</soundMeleeHit>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>right spike</label>
+					<labelNoLocation>spike</labelNoLocation>
 					<capacities>
 						<li>Stab</li>
 					</capacities>
 					<power>17.2</power>
 					<cooldownTime>1.8</cooldownTime>
-					<armorPenetrationBlunt>7.1</armorPenetrationBlunt>
-					<armorPenetrationSharp>4.8</armorPenetrationSharp>
+					<armorPenetrationBlunt>15</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
 					<linkedBodyPartsGroup>RightSpike</linkedBodyPartsGroup>
 					<soundMeleeHit>Pawn_Dreadmeld_Attack_Spike</soundMeleeHit>
 				</li>
@@ -370,7 +393,7 @@
 					<armorPenetrationBlunt>10</armorPenetrationBlunt>
 					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
 					<chanceFactor>0.2</chanceFactor>
-					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>					
+					<soundMeleeHit>Pawn_Fleshbeast_Attack_Blunt</soundMeleeHit>
 				</li>
 			</tools>
 		</value>
diff --git a/Anomaly/Patches/ThingTreeDefs/ThinkTreeDefs_Anomaly.xml b/Anomaly/Patches/ThingTreeDefs/ThinkTreeDefs_Anomaly.xml
index 22e119ddfc..f7763b76ea 100644
--- a/Anomaly/Patches/ThingTreeDefs/ThinkTreeDefs_Anomaly.xml
+++ b/Anomaly/Patches/ThingTreeDefs/ThinkTreeDefs_Anomaly.xml
@@ -8,7 +8,7 @@
 			<li Class="JobGiver_FleeForDistance">
 				<enemyDistToFleeRange>3.9~14.9</enemyDistToFleeRange>
 				<fleeDistRange>15.5~24</fleeDistRange>
-			  </li>
+			</li>
 		</value>
 	</Operation>
 
diff --git a/Biotech/Patches/DamageDefs/Damages_Misc.xml b/Biotech/Patches/DamageDefs/Damages_Misc.xml
index dfaa9a3b85..fab48ca6e0 100644
--- a/Biotech/Patches/DamageDefs/Damages_Misc.xml
+++ b/Biotech/Patches/DamageDefs/Damages_Misc.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<!-- ========== Beam ========== -->
-
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/DamageDef[defName="Beam"]</xpath>
 		<value>
@@ -13,13 +11,6 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/DamageDef[defName="AcidBurn"]/armorCategory</xpath>
-		<value>
-			<armorCategory>Heat</armorCategory>
-		</value>
-	</Operation>
-
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/DamageDef[defName="Vaporize"]</xpath>
 		<value>
diff --git a/Patches/Core/DamageDefs/Damages_LocalInjury.xml b/Patches/Core/DamageDefs/Damages_LocalInjury.xml
index c7de68e9da..f7bff1b5fc 100644
--- a/Patches/Core/DamageDefs/Damages_LocalInjury.xml
+++ b/Patches/Core/DamageDefs/Damages_LocalInjury.xml
@@ -177,4 +177,13 @@
 		</value>
 	</Operation>
 
+	<!-- ========== Acid Burn armor category ========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/DamageDef[defName="AcidBurn"]/armorCategory</xpath>
+		<value>
+			<armorCategory>Heat</armorCategory>
+		</value>
+	</Operation>
+
 </Patch>
\ No newline at end of file