diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml
index 7af13c1786..8b6fafffae 100644
--- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
+++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
@@ -4,7 +4,7 @@
 	<!-- ==========  Bases =========== -->
 	
 	<ThingDef Name="BaseOpticBoltCE" ParentName="BaseBulletCE" Abstract="true">
-		<label>energy bolt</label>
+		<label>optical energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -17,7 +17,7 @@
 	</ThingDef>
 	
 	<ThingDef Name="BaseCrucibleBoltCE" ParentName="BaseBulletCE" Abstract="true">
-		<label>energy bolt</label>
+		<label>crucible energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cruciblebolt</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -51,7 +51,6 @@
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_HarvesterCannon</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Laser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -67,7 +66,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_PlasmaTurretBombard</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -93,7 +91,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_Federation_PlasmaBlast</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/MFlux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -118,7 +115,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_Federation_PlasmaCluster</defName>
 		<thingClass>CombatExtended.ProjectileCE_HeightFuse</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/MFlux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -154,7 +150,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_Federation_PlasmaSub</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -176,7 +171,6 @@
 	<ThingDef ParentName="BaseCrucibleBoltCE">
 		<defName>Bullet_CrucibleCannon_CE</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -216,7 +210,6 @@
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaRifle_Fed</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -256,7 +249,6 @@
 
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_AuxiliaryPistol</defName>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Laser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -270,7 +262,6 @@
 
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_MakeshiftCrucibleRifle</defName>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Laser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -368,7 +359,6 @@
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaCaster</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -390,7 +380,6 @@
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaCaster_Fed</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Flux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -432,7 +421,6 @@
 
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_CrucibleCarbine_CE</defName>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml
index 5553dbf3ec..ff8554bcb7 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml	
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
-
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/DamageDef[
 		defName="Optic" or
@@ -13,26 +12,22 @@
 			</li>
 		</value>
 	</Operation>
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/DamageDef[defName="Optic"]</xpath>
 		<value>
 			<defaultArmorPenetration>0.8</defaultArmorPenetration>
 		</value>
 	</Operation>
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/DamageDef[defName="Crucible"]</xpath>
 		<value>
 			<defaultArmorPenetration>0.4</defaultArmorPenetration>
 		</value>
 	</Operation>
-
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/DamageDef[defName="Plasma"]</xpath>
 		<value>
 			<defaultArmorPenetration>0.30</defaultArmorPenetration>
 		</value>
 	</Operation>
-
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml
index e33a2ee1f6..a0f16a62b6 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
@@ -11,7 +11,7 @@
 			defName="AD_CruciblePistol" or
 			defName="AD_FedPistol" or
 			defName="AD_AuxPistol"
-			]/tools</xpath>
+			]/tools </xpath>
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
@@ -238,8 +238,8 @@
 		<xpath>Defs/ThingDef[defName="AD_CrucibleRifle"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_UnderBarrel">
-				<standardLabel>switch to crucible mode</standardLabel>
-				<underBarrelLabel>switch to optical mode</underBarrelLabel>
+				<standardLabel>switch to high-output crucible mode</standardLabel>
+				<underBarrelLabel>switch to high-penetration optical mode</underBarrelLabel>
 				<oneAmmoHolder>True</oneAmmoHolder>
 				<propsUnderBarrel>
 					<magazineSize>15</magazineSize>
@@ -260,7 +260,7 @@
 				<propsFireModesUnderBarrel>
 					<aiAimMode>AimedShot</aiAimMode>
 					<noSingleShot>false</noSingleShot>
-					<aimedBurstShotCount>5</aimedBurstShotCount>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
 					<aiUseBurstMode>TRUE</aiUseBurstMode>
 				</propsFireModesUnderBarrel>
 			</li>
@@ -352,8 +352,8 @@
 		<xpath>Defs/ThingDef[defName="AD_CruciblePistol"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_UnderBarrel">
-				<standardLabel>switch to crucible mode</standardLabel>
-				<underBarrelLabel>switch to optical mode</underBarrelLabel>
+				<standardLabel>switch to high-output crucible mode</standardLabel>
+				<underBarrelLabel>switch to high-penetration optical mode</underBarrelLabel>
 				<oneAmmoHolder>True</oneAmmoHolder>
 				<propsUnderBarrel>
 					<magazineSize>15</magazineSize>
@@ -408,7 +408,7 @@
 			<li>CE_OneHandedWeapon</li>
 		</weaponTags>
 		<FireModes>
-			<aimedBurstShotCount>5</aimedBurstShotCount>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
 			<aiUseBurstMode>FALSE</aiUseBurstMode>
 		</FireModes>
 		<AmmoUser>
@@ -532,8 +532,8 @@
 		<xpath>Defs/ThingDef[defName="AD_CruciblePresicionRifle"]/comps</xpath>
 		<value>
 			<li Class="CombatExtended.CompProperties_UnderBarrel">
-				<standardLabel>switch to crucible mode</standardLabel>
-				<underBarrelLabel>switch to optical mode</underBarrelLabel>
+				<standardLabel>switch to high-output crucible mode</standardLabel>
+				<underBarrelLabel>switch to high-penetration optical mode</underBarrelLabel>
 				<oneAmmoHolder>True</oneAmmoHolder>
 				<propsUnderBarrel>
 					<magazineSize>15</magazineSize>