diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml
new file mode 100644
index 0000000000..dcd206f652
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids 2</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/AbilityDef[defName="AA_GreaterVileSpit"]/verbProperties/range</xpath>
+					<value>
+						<range>30.9</range>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AA_GreaterBlackHiveBolt"]/projectile</xpath>
+					<value>
+						<projectile Class="CombatExtended.ProjectilePropertiesCE">
+							<damageDef>AA_BlackHiveBolt</damageDef>
+							<speed>30</speed>
+							<damageAmountBase>20</damageAmountBase>
+							<armorPenetrationSharp>9</armorPenetrationSharp>
+							<armorPenetrationBlunt>12</armorPenetrationBlunt>
+							<numExtraHitCells>5</numExtraHitCells>
+							<filthCount>1</filthCount>
+							<shadowSize>0</shadowSize>
+							<filth>AA_FilthSlimyPuke</filth>
+						</projectile>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml
new file mode 100644
index 0000000000..237a20d351
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids 2</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/HediffDef[defName="AA_MechanoidRendingClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>mechanoid rending claws</label>
+								<capacities>
+									<li>AA_EMPSlash</li>
+								</capacities>
+								<power>16</power>
+								<cooldownTime>1.5</cooldownTime>
+								<armorPenetrationSharp>2.0</armorPenetrationSharp>
+								<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml
new file mode 100644
index 0000000000..32d1040e3e
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids 2</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Quadruped</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.05</MeleeDodgeChance>
+						<MeleeCritChance>0.33</MeleeCritChance>
+						<MeleeParryChance>0.57</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>25</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>14</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>AA_ExtraDamageMechanoidsClaws</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>1.28</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>50</armorPenetrationSharp>
+								<armorPenetrationBlunt>30</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>front claw</label>
+								<capacities>
+									<li>AA_ExtraDamageMechanoidsClaws</li>
+								</capacities>
+								<power>51</power>
+								<cooldownTime>1.45</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>7.5</armorPenetrationSharp>
+								<armorPenetrationBlunt>15</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>2.64</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>5.1</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]</xpath>
+						<value>
+							<comps />
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackEmpress"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>2750</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>400</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.25</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml
new file mode 100644
index 0000000000..df86982c29
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml	
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids 2</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases</xpath>
+					<value>
+						<MeleeDodgeChance>0.03</MeleeDodgeChance>
+						<MeleeCritChance>0.30</MeleeCritChance>
+						<MeleeParryChance>0.57</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases/ArmorRating_Blunt</xpath>
+					<value>
+						<ArmorRating_Blunt>30</ArmorRating_Blunt>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases/ArmorRating_Sharp</xpath>
+					<value>
+						<ArmorRating_Sharp>12</ArmorRating_Sharp>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>AA_ExtraDamageMechanoidsClaws</li>
+								</capacities>
+								<power>37</power>
+								<cooldownTime>1.48</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>50</armorPenetrationSharp>
+								<armorPenetrationBlunt>30</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head claw</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>65</power>
+								<cooldownTime>1.65</cooldownTime>
+								<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+								<armorPenetrationSharp>5</armorPenetrationSharp>
+								<armorPenetrationBlunt>10</armorPenetrationBlunt>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>head</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>34</power>
+								<cooldownTime>2.64</cooldownTime>
+								<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+								<chanceFactor>0.2</chanceFactor>
+								<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]/comps</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]</xpath>
+						<value>
+							<comps />
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackQueen"]/comps</xpath>
+					<value>
+						<li Class="CombatExtended.CompProperties_ArmorDurability">
+							<Durability>3000</Durability>
+							<Regenerates>true</Regenerates>
+							<RegenInterval>400</RegenInterval>
+							<RegenValue>5</RegenValue>
+							<MinArmorPct>0.25</MinArmorPct>
+						</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml
new file mode 100644
index 0000000000..a3eee9328a
--- /dev/null
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Factions Expanded - Insectoids 2</li>
+		</mods>
+
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackSwarmling"]/statBases/MoveSpeed</xpath>
+					<value>
+						<MoveSpeed>1.9</MoveSpeed>
+						<MeleeDodgeChance>0.1</MeleeDodgeChance>
+						<MeleeCritChance>0.02</MeleeCritChance>
+						<MeleeParryChance>0.01</MeleeParryChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="VFEI2_BlackSwarmling"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>mouth</label>
+								<capacities>
+									<li>Bite</li>
+								</capacities>
+								<power>3</power>
+								<cooldownTime>1.5</cooldownTime>
+								<linkedBodyPartsGroup>Mouth</linkedBodyPartsGroup>
+								<armorPenetrationSharp>0.1</armorPenetrationSharp>
+								<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml
index 616c4a14e0..8e6dfadcca 100644
--- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml	
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml	
@@ -3,12 +3,21 @@
 
 	<Operation Class="PatchOperationFindMod">
 		<mods>
-			<li>Vanilla Psycasts Expanded</li>
+			<li>Vanilla Factions Expanded - Insectoids 2</li>
 		</mods>
 
 		<match Class="PatchOperationSequence">
 			<operations>
 
+				<li Class="PatchOperationAddModExtension">
+					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]</xpath>
+					<value>
+						<li Class="CombatExtended.RacePropertiesExtensionCE">
+							<bodyShape>Birdlike</bodyShape>
+						</li>
+					</value>
+				</li>
+
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases</xpath>
 					<value>
@@ -48,9 +57,9 @@
 								<armorPenetrationBlunt>30</armorPenetrationBlunt>
 							</li>
 							<li Class="CombatExtended.ToolCE">
-								<label>AAVPE_InfectedMandibles</label>
+								<label>infected mandibles</label>
 								<capacities>
-									<li>Cut</li>
+									<li>AAVPE_InfectedMandibles</li>
 								</capacities>
 								<power>65</power>
 								<cooldownTime>1.65</cooldownTime>
@@ -78,7 +87,7 @@
 					<nomatch Class="PatchOperationAdd">
 						<xpath>Defs/ThingDef[defName="AAVPE_BlackQueen"]</xpath>
 						<value>
-							<comps/>
+							<comps />
 						</value>
 					</nomatch>
 				</li>
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml
index 8569c0e7d9..7e1a404d84 100644
--- a/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml	
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml	
@@ -16,7 +16,8 @@
 		<xpath>Defs/DamageDef[defName="AA_ToxicSting" or
 			defName="AA_InfectedClaws" or
 			defName="AA_ToxicBite" or
-			defName="AA_ToxicBolt"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt </xpath>
+			defName="AA_ToxicBolt" or
+			defName="AA_BlackHiveBolt"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt </xpath>
 		<value>
 			<severityPerDamageDealt>0.01</severityPerDamageDealt>
 		</value>
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml
index 1b5167e392..fcba9ae43e 100644
--- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml	
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml	
@@ -21,6 +21,7 @@
 			defName="AA_FrostWeb" or
 			defName="AA_Plasma" or
 			defName="AA_PoisonBolt" or
+			defName="AA_BlackHiveBolt" or
 			defName="AA_Quill" or
 			defName="AA_RedPoisonBolt" or
 			defName="AA_Web" or
@@ -120,6 +121,20 @@
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<flyOverhead>false</flyOverhead>
 				<damageDef>AA_ToxicBolt</damageDef>
+				<damageAmountBase>9</damageAmountBase>
+				<speed>25</speed>
+				<armorPenetrationSharp>2.3</armorPenetrationSharp>
+				<armorPenetrationBlunt>1.5</armorPenetrationBlunt>
+			</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AA_BlackHiveBolt"]/projectile</xpath>
+		<value>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<flyOverhead>false</flyOverhead>
+				<damageDef>AA_BlackHiveBolt</damageDef>
 				<damageAmountBase>10</damageAmountBase>
 				<speed>27</speed>
 				<armorPenetrationSharp>2.5</armorPenetrationSharp>
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml
index c4bee251e0..488c07d29c 100644
--- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml	
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml	
@@ -23,7 +23,7 @@
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+					<defaultProjectile>AA_BlackHiveBolt</defaultProjectile>
 					<warmupTime>2.4</warmupTime>
 					<burstShotCount>1</burstShotCount>
 					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
@@ -45,7 +45,7 @@
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>AA_PoisonBolt</defaultProjectile>
+					<defaultProjectile>AA_BlackHiveBolt</defaultProjectile>
 					<warmupTime>1.6</warmupTime>
 					<burstShotCount>1</burstShotCount>
 					<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml
index 9f6125c8fd..179426ef88 100644
--- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml	
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml	
@@ -54,7 +54,7 @@
 				<li Class="CombatExtended.ToolCE">
 					<label>mandibles</label>
 					<capacities>
-						<li>Bite</li>
+						<li>AA_ExtraDamageMechanoidsBite</li>
 					</capacities>
 					<power>9</power>
 					<cooldownTime>1.33</cooldownTime>
@@ -83,7 +83,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="AA_BlackScarab"]</xpath>
 			<value>
-				<comps/>
+				<comps />
 			</value>
 		</nomatch>
 	</Operation>
@@ -164,7 +164,7 @@
 				<li Class="CombatExtended.ToolCE">
 					<label>head claw</label>
 					<capacities>
-						<li>Cut</li>
+						<li>AA_ExtraDamageMechanoidsClaws</li>
 					</capacities>
 					<power>22</power>
 					<cooldownTime>1.68</cooldownTime>
@@ -204,7 +204,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="AA_BlackSpelopede"]</xpath>
 			<value>
-				<comps/>
+				<comps />
 			</value>
 		</nomatch>
 	</Operation>
@@ -285,7 +285,7 @@
 				<li Class="CombatExtended.ToolCE">
 					<label>head claw</label>
 					<capacities>
-						<li>Cut</li>
+						<li>AA_ExtraDamageMechanoidsClaws</li>
 					</capacities>
 					<power>44</power>
 					<cooldownTime>2.0</cooldownTime>
@@ -325,7 +325,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="AA_BlackSpider"]</xpath>
 			<value>
-				<comps/>
+				<comps />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml
index 7b30f7b79f..152ea22351 100644
--- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml	
+++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml	
@@ -64,7 +64,7 @@
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<capacities>
-						<li>Stab</li>
+						<li>AA_ExtraDamageMechanoidsTusk</li>
 					</capacities>
 					<power>48</power>
 					<cooldownTime>2.68</cooldownTime>
@@ -81,7 +81,7 @@
 		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/ThingDef[defName="AA_MammothWorm"]</xpath>
 			<value>
-				<comps/>
+				<comps />
 			</value>
 		</nomatch>
 	</Operation>
diff --git a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml
index 0f4e8467da..e0468662c7 100644
--- a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml	
+++ b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml	
@@ -84,6 +84,7 @@
 		<weaponTags>
 			<li>CE_SMG</li>
 			<li>CE_AI_BROOM</li>
+			<li>NoSwitch</li>
 		</weaponTags>
 	</Operation>
 
@@ -121,6 +122,9 @@
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 			<aiAimMode>Snapshot</aiAimMode>
 		</FireModes>
+		<weaponTags>
+			<li>NoSwitch</li>
+		</weaponTags>		
 	</Operation>
 
 	<!-- Scout Gun -->
@@ -156,6 +160,7 @@
 		</FireModes>
 		<weaponTags>
 			<li>CE_AI_AR</li>
+			<li>NoSwitch</li>			
 		</weaponTags>
 	</Operation>
 
@@ -192,6 +197,7 @@
 		</FireModes>
 		<weaponTags>
 			<li>CE_AI_AR</li>
+			<li>NoSwitch</li>
 		</weaponTags>
 	</Operation>