diff --git a/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Defs/ThingDefs_Misc/Weapons_Ranged.xml
index 98e7649dbe..474f78c139 100644
--- a/Defs/ThingDefs_Misc/Weapons_Ranged.xml
+++ b/Defs/ThingDefs_Misc/Weapons_Ranged.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Defs>
 
-  <!-- ==================== M97 Grenade Launcher ==================== -->
+  <!-- ==================== Grenade Launcher ==================== -->
 
   <ThingDef ParentName="BaseMakeableGun">
     <defName>CE_GrenadeLauncher</defName>
-    <label>Grenade Launcher</label>
+    <label>grenade launcher</label>
     <description>A simple, locally produced break-action grenade launcher, capable of firing a variety of different projectiles.</description>
     <graphicData>
       <texPath>Things/Weapons/GrenadeLauncher</texPath>
@@ -102,7 +102,7 @@
 
   <ThingDef ParentName="BaseGunWithQuality">
     <defName>CE_ExplosiveBoltProjector</defName>
-    <label>Explosive Bolt Projector</label>
+    <label>explosive bolt projector</label>
     <description>A low-velocity, high-trajectory fire support system deployed by mechanoid Pikeman. While inaccurate and slow-firing, it remains a potent weapon against static targets.</description>
     <graphicData>
       <texPath>Things/Item/Equipment/WeaponRanged/NeedleGun</texPath>
diff --git a/Patches/Nihal/PawnKinds_NiHal.xml b/Patches/Nihal/PawnKinds_NiHal.xml
index 84ab95b2b2..b89fb17b3c 100644
--- a/Patches/Nihal/PawnKinds_NiHal.xml
+++ b/Patches/Nihal/PawnKinds_NiHal.xml
@@ -25,7 +25,7 @@
 					<shieldTags>
 					  <li>OutlanderShield</li>
 					</shieldTags>
-					<shieldChance>0.5</shieldChance>
+					<shieldChance>0.25</shieldChance>
 					<sidearms>
 					  <li>
 						<generateChance>0.5</generateChance>
@@ -41,6 +41,15 @@
 				  </li>
 				</value>
 			</li>
+			<li Class="PatchOperationReplace">
+				<xpath>/Defs/PawnKindDef[defName="NihalPeasant"]/weaponMoney</xpath>
+				<value>
+					<weaponMoney>
+					  <min>350</min>
+					  <max>800</max>
+					</weaponMoney>
+				</value>
+			</li>			
 			<li Class="PatchOperationAddModExtension">
 				<xpath>/Defs/PawnKindDef[defName="NihalSlave"]</xpath>
 				<value>
@@ -118,7 +127,7 @@
 					<shieldTags>
 					  <li>OutlanderShield</li>
 					</shieldTags>
-					<shieldChance>0.5</shieldChance>
+					<shieldChance>0.25</shieldChance>
 					<sidearms>
 					  <li>
 						<generateChance>0.5</generateChance>
@@ -134,6 +143,15 @@
 				  </li>
 				</value>
 			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>/Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
+				<value>
+					<weaponMoney>
+					  <min>400</min>
+					  <max>800</max>
+					</weaponMoney>
+				</value>
+			</li>			
 			<li Class="PatchOperationAddModExtension">
 				<xpath>/Defs/PawnKindDef[defName="NihalSniper"]</xpath>
 				<value>
diff --git a/Patches/Nihal/ThingDefs_Weapons/Weapons.xml b/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
index ad6733b5db..1966232833 100644
--- a/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
+++ b/Patches/Nihal/ThingDefs_Weapons/Weapons.xml
@@ -9,10 +9,187 @@
 		<match Class="PatchOperationSequence">
 			<operations>
 
+			<!-- Melee Tools -->
+
+		  <li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="Gun_NihalPistol"]/tools</xpath>
+			<value>
+			  <tools>
+				<li Class="CombatExtended.ToolCE">
+				  <label>grip</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>2</power>
+				  <cooldownTime>1.54</cooldownTime>
+				  <chanceFactor>1.5</chanceFactor>
+				  <armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+				  <label>muzzle</label>
+				  <capacities>
+					<li>Poke</li>
+				  </capacities>
+				  <power>2</power>
+				  <cooldownTime>1.54</cooldownTime>
+				  <armorPenetrationBlunt>0.555</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			  </tools>
+			</value>
+		  </li>
+
+		  <li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="Gun_NihalShotgun" or defName="Gun_NihalRifle" or defName="Gun_NihalLMG" or defName="Gun_NihalSniper"  or defName="Gun_NihalThoober"  or defName="Gun_NihalCarbine"]/tools</xpath>
+			<value>
+			  <tools>
+				<li Class="CombatExtended.ToolCE">
+				  <label>stock</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>8</power>
+				  <cooldownTime>1.55</cooldownTime>
+				  <chanceFactor>1.5</chanceFactor>
+				  <armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+				  <label>barrel</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>5</power>
+				  <cooldownTime>2.02</cooldownTime>
+				  <armorPenetrationBlunt>1.630</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+				  <label>muzzle</label>
+				  <capacities>
+					<li>Poke</li>
+				  </capacities>
+				  <power>8</power>
+				  <cooldownTime>1.55</cooldownTime>
+				  <armorPenetrationBlunt>2.755</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			  </tools>
+			</value>
+		  </li>
+
+		  <li Class="PatchOperationReplace">
+			<xpath>Defs/ThingDef[defName="Gun_NihalRocket" or defName="Gun_NihalTripleRocket"]/tools</xpath>
+			<value>
+			  <tools>
+				<li Class="CombatExtended.ToolCE">
+				  <label>barrel</label>
+				  <capacities>
+					<li>Blunt</li>
+				  </capacities>
+				  <power>10</power>
+				  <cooldownTime>2.44</cooldownTime>
+				  <armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				  <linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+			  </tools>
+			</value>
+		  </li>
+
+			<!-- NiHal Bardiche -->
+
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/tools</xpath>
+				<value>
+					<tools>
+						<li Class="CombatExtended.ToolCE">
+							<label>handle</label>
+							<capacities>
+								<li>Poke</li>
+							</capacities>
+							<power>3</power>
+							<cooldownTime>1.59</cooldownTime>
+							<chanceFactor>0.10</chanceFactor>
+							<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+							<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+						</li>
+						<li Class="CombatExtended.ToolCE">
+							<label>edge</label>
+							<capacities>
+								<li>Cut</li>
+							</capacities>
+							<power>17</power>
+							<cooldownTime>3.52</cooldownTime>
+							<chanceFactor>0.30</chanceFactor>
+							<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
+							<armorPenetrationSharp>0.68</armorPenetrationSharp>
+							<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+						</li>
+					</tools>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]/statBases</xpath>
+				<value>
+					<Bulk>6</Bulk>
+					<MeleeCounterParryBonus>0.15</MeleeCounterParryBonus>
+				</value>
+			</li>
+
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="MeleeWeapon_fishytooth"]</xpath>
+				<value>
+					<equippedStatOffsets>
+						<MeleeCritChance>0.10</MeleeCritChance>
+						<MeleeParryChance>0.15</MeleeParryChance>
+						<MeleeDodgeChance>0.20</MeleeDodgeChance>	
+					</equippedStatOffsets>
+				</value>	
+			</li>
+
 			<!-- Nihal Rocket Launcher -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
 				<defName>Gun_NihalRocket</defName>
+				<statBases>
+					<Bulk>3.1</Bulk>
+					<Mass>1.0</Mass>
+					<SwayFactor>1.1</SwayFactor>
+					<ShotSpread>1</ShotSpread>
+					<SightsEfficiency>0.7</SightsEfficiency>
+					<RangedWeapon_Cooldown>1.5</RangedWeapon_Cooldown>
+					<WorkToMake>32000</WorkToMake>
+				</statBases>
+				<Properties>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_RPG7Grenade_HEAT</defaultProjectile>
+					<warmupTime>3</warmupTime>
+					<range>38</range>
+					<burstShotCount>1</burstShotCount>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<minRange>5</minRange>
+					<soundCast>OLaunchers</soundCast>
+					<muzzleFlashScale>14</muzzleFlashScale>
+				</Properties>
+				<AmmoUser>
+					<magazineSize>1</magazineSize>
+					<reloadTime>8</reloadTime>
+					<ammoSet>AmmoSet_RPG7Grenade</ammoSet>
+				</AmmoUser>
+				<FireModes>
+				</FireModes>
+				<weaponTags>
+					<li>NiHalMissile</li>
+				</weaponTags>
+			</li>
+
+			<!-- Nihal Triple Rocket Launcher -->
+
+			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+				<defName>Gun_NihalTripleRocket</defName>
 				<statBases>
 					<Bulk>3.1</Bulk>
 					<Mass>1.0</Mass>
@@ -47,24 +224,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalRocket"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>10</power>
-							<cooldownTime>3.66</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>			
-
 			<!-- Nihal Big Pistol -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -100,34 +259,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalPistol"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>grip</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.56</cooldownTime>
-							<linkedBodyPartsGroup>Grip</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>2</power>
-							<cooldownTime>1.54</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>0.555</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
 			<!-- Nihal Shotgun -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -164,45 +295,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalShotgun"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
-
 			<!-- Nihal Rifle -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -249,44 +341,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalRifle"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
 			<!-- Nihal LMG -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -336,44 +390,6 @@
 				</weaponTags>
 			</li>
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalLMG"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
-			</li>
-
 			<!-- Nihal Sniper -->
 
 			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
@@ -408,45 +424,102 @@
 					<li>NiHalSniper</li>
 				</weaponTags>
 			</li>
+			
+			<!-- NiHal Thoober -->
 
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName="Gun_NihalSniper"]/tools</xpath>
-				<value>
-					<tools>
-						<li Class="CombatExtended.ToolCE">
-							<label>stock</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.79</cooldownTime>
-							<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>barrel</label>
-							<capacities>
-								<li>Blunt</li>
-							</capacities>
-							<power>5</power>
-							<cooldownTime>3.02</cooldownTime>
-							<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>1.63</armorPenetrationBlunt>
-						</li>
-						<li Class="CombatExtended.ToolCE">
-							<label>muzzle</label>
-							<capacities>
-								<li>Poke</li>
-							</capacities>
-							<power>8</power>
-							<cooldownTime>1.55</cooldownTime>
-							<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-							<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
-						</li>
-					</tools>
-				</value>
+			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+				<defName>Gun_NihalCarbine</defName>
+				<statBases>
+				  <WorkToMake>14000</WorkToMake>	
+				  <SightsEfficiency>1.1</SightsEfficiency>
+				  <ShotSpread>0.16</ShotSpread>
+				  <SwayFactor>1.00</SwayFactor>
+				  <Bulk>7.31</Bulk>
+				  <Mass>2.70</Mass>
+				  <RangedWeapon_Cooldown>0.93</RangedWeapon_Cooldown>
+				</statBases>
+				<costList>
+				  <Plasteel>20</Plasteel>
+				  <Uranium>5</Uranium>
+				  <Steel>40</Steel>
+				  <ComponentSpacer>1</ComponentSpacer>
+				  <ComponentIndustrial>5</ComponentIndustrial>
+				</costList>				
+				<Properties>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_40x46mmGrenade_HE</defaultProjectile>
+					<ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+					<warmupTime>1.1</warmupTime>
+					<range>44</range>
+					<minRange>5</minRange>
+					<targetParams>
+					  <canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<soundCast>InfernoCannon_Fire</soundCast>
+					<muzzleFlashScale>14</muzzleFlashScale>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				</Properties>
+				<AmmoUser>
+					<magazineSize>1</magazineSize>
+					<reloadTime>0.85</reloadTime>
+					<ammoSet>AmmoSet_40x46mmGrenade</ammoSet>
+				</AmmoUser>
+				<FireModes>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+					<aiAimMode>SuppressFire</aiAimMode>
+				</FireModes>
+				<weaponTags>
+					<li>NiHalRifle</li>
+				</weaponTags>			
 			</li>
 
+			<!-- NiHal Carbine -->
+
+			<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+				<defName>Gun_NihalCarbine</defName>
+				<statBases>
+					<Mass>2.7</Mass>
+					<RangedWeapon_Cooldown>0.30</RangedWeapon_Cooldown>
+					<SightsEfficiency>1.00</SightsEfficiency>
+					<ShotSpread>0.06</ShotSpread>
+					<SwayFactor>1.05</SwayFactor>
+					<Bulk>5.50</Bulk>
+					<WorkToMake>42000</WorkToMake>
+				</statBases>
+				<costList>
+					<Uranium>5</Uranium>
+					<Steel>80</Steel>
+					<Plasteel>80</Plasteel>
+					<ComponentSpacer>1</ComponentSpacer>
+					<ComponentIndustrial>5</ComponentIndustrial>
+				</costList>
+				<Properties>
+					<recoilAmount>1.2</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_6x18mmCharged</defaultProjectile>
+					<warmupTime>1</warmupTime>
+					<range>50</range>
+					<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
+					<burstShotCount>3</burstShotCount>
+					<soundCast>ORifle</soundCast>
+					<soundCastTail>GunTail_Medium</soundCastTail>
+					<muzzleFlashScale>9</muzzleFlashScale>
+				</Properties>
+				<AmmoUser>
+					<magazineSize>24</magazineSize>
+					<reloadTime>3</reloadTime>
+					<ammoSet>AmmoSet_6x18mmCharged</ammoSet>
+				</AmmoUser>
+				<FireModes>
+					<aiAimMode>AimedShot</aiAimMode>
+				</FireModes>
+				<weaponTags>
+					<li>NiHalRifle</li>
+				</weaponTags>
+			</li>
+			
 			</operations>		
 		</match>
 	</Operation>
diff --git a/Patches/Save Our Ship 2/Creatures_SOS2.xml b/Patches/Save Our Ship 2/Creatures_SOS2.xml
index d312e8ebf6..d1bd0110e7 100644
--- a/Patches/Save Our Ship 2/Creatures_SOS2.xml	
+++ b/Patches/Save Our Ship 2/Creatures_SOS2.xml	
@@ -243,7 +243,7 @@
 		<xpath>Defs/ThingDef[@Name="BaseShuttle"]</xpath>
 		<value>
 			<li Class="CombatExtended.RacePropertiesExtensionCE">
-				<bodyShape>QuadrupedLow</bodyShape>
+				<bodyShape>Vehicle</bodyShape>
 			</li>
 		</value>
 	</li>
@@ -300,13 +300,12 @@
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
+					<label>hull</label>
 					<capacities>
 						<li>Blunt</li>
 					</capacities>
 					<power>35</power>
 					<cooldownTime>3.51</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
 					<armorPenetrationSharp>0</armorPenetrationSharp>
 					<armorPenetrationBlunt>15</armorPenetrationBlunt>
 					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
diff --git a/Textures/Things/Item/Equipment/WeaponRanged/LMG.png b/Textures/Things/Item/Equipment/WeaponRanged/LMG.png
new file mode 100644
index 0000000000..6e4bc6495f
Binary files /dev/null and b/Textures/Things/Item/Equipment/WeaponRanged/LMG.png differ
diff --git a/Textures/Things/Weapons/GrenadeLauncher.png b/Textures/Things/Weapons/GrenadeLauncher.png
index a9b9b2bdfe..3399729191 100644
Binary files a/Textures/Things/Weapons/GrenadeLauncher.png and b/Textures/Things/Weapons/GrenadeLauncher.png differ