diff --git a/Content/Items/Alien/alienitems.xml b/Content/Items/Alien/alienitems.xml
index e44356ed..3d538db3 100644
--- a/Content/Items/Alien/alienitems.xml
+++ b/Content/Items/Alien/alienitems.xml
@@ -9,8 +9,8 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="630,0,82,108" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -54,8 +54,8 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="542,112,102,99" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -80,7 +80,7 @@
       </StatusEffect>
     </Holdable>
     <!-- Emits steam periodically when in water, burns. Had to use Lightcomponent to make it work -->
-    <LightComponent range="150.0" lightcolor="210,120,30,120" IsOn="False" castshadows="false" allowingameediting="false" pulseamount="0.1" pulsefrequency="4">
+    <LightComponent range="600" lightcolor="210,120,30,120" IsOn="False" castshadows="false" allowingameediting="false" pulseamount="0.1" pulsefrequency="4">
       <Statuseffect type="InWater" target="This" IsOn="True" Interval="20" />
       <Statuseffect type="NotInWater" target="This" IsOn="False" />
       <StatusEffect type="OnActive" target="This" IsOn="False" delay="5" stackable="False" />
@@ -112,8 +112,8 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="645,108,93,103" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -167,8 +167,8 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="718,6,78,102" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -204,8 +204,8 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.25 " />
       <Price storeidentifier="merchantmine" />
     </Price>
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="2" spawnprobability="0.02" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.6" sourcerect="541,0,88,108" origin="0.5,0.5" />
     <Deconstruct time="30">
       <Item identifier="steel" />
@@ -231,7 +231,7 @@
         <sound file="Content/Items/Alien/Alienpump.ogg" range="500.0" loop="true" volume="1" />
       </StatusEffect>
     </Holdable>
-    <LightComponent range="150.0" lightcolor="255,56,144,111" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.25" />
+    <LightComponent range="600" lightcolor="255,56,144,111" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.25" />
   </Item>
   <Item name="" identifier="psychosisartifact_event" nameidentifier="psychosisartifact" variantof="psychosisartifact" hideinmenus="true">
     <Price baseprice="2000" sold="false" canbespecial="false">
@@ -247,11 +247,11 @@
       <Clear />
     </Holdable>
   </Item>
-  <Item name="" identifier="alientrinket1" category="Alien" maxstacksize="8" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="alientrinket1" category="Alien" maxstacksize="60" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="4" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="0.85" />
       <Price storeidentifier="merchantcity" multiplier="0.85" />
@@ -270,11 +270,11 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="alientrinket2" category="Alien" maxstacksize="8" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="alientrinket2" category="Alien" maxstacksize="60" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="4" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="0.85" />
       <Price storeidentifier="merchantcity" multiplier="0.85" />
@@ -293,11 +293,11 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="alientrinket3" category="Alien" maxstacksize="8" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="alientrinket3" category="Alien" maxstacksize="60" Tags="alien, smallitem,smallalienartifact" scale="0.5" impactsoundtag="impact_metal_heavy">
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="4" maxamount="8" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="0.85" />
       <Price storeidentifier="merchantcity" multiplier="0.85" />
@@ -316,18 +316,18 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="oxygeniteshard" category="Alien,Material" cargocontaineridentifier="explosivecrate" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="oxygeniteshard" category="Alien,Material" cargocontaineridentifier="explosivecrate" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.15.22.1" Tags="alien,smallitem" />
-    <Price baseprice="200" minavailable="1">
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" multiplier="1.15" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantmine" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer primary="ruintreasure" minamount="2" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer primary="ruintreasure" minamount="4" maxamount="6" spawnprobability="1" />
     <Deconstruct time="20">
       <Item identifier="liquidoxygenite" mincondition="0.5" />
       <Item identifier="liquidoxygenite" mincondition="0.9" />
@@ -351,17 +351,17 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="sulphuriteshard" category="Alien,Material" cargocontaineridentifier="metalcrate" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
-    <Price baseprice="200" minavailable="1">
+  <Item name="" identifier="sulphuriteshard" category="Alien,Material" cargocontaineridentifier="metalcrate" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" tags="alien,smallitem" impacttolerance="8" impactsoundtag="impact_metal_light">
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" multiplier="1.15" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantmine" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer primary="ruintreasure" minamount="2" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer primary="ruintreasure" minamount="4" maxamount="6" spawnprobability="1" />
     <Deconstruct time="20">
       <Item identifier="sulphuricacid" mincondition="0.5" />
       <Item identifier="sulphuricacid" mincondition="0.9" />
@@ -391,10 +391,10 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="researchcontainer" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="researchcontainer" amount="2" spawnprobability="0.02" />
     <Deconstruct time="20">
       <Item identifier="dementonite" />
       <Item identifier="fulgurium" />
@@ -405,7 +405,7 @@
     <Holdable slots="Any,RightHand,LeftHand" controlpose="true" aimpos="90,10" handle1="2,-7" msg="ItemMsgPickUpSelect">
       <StatusEffect type="OnBroken" target="This" Condition="100" setvalue="true" delay="1" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" itempos="20,-20">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" itempos="20,-20">
       <Containable items="alienpowercell" />
     </ItemContainer>
     <RangedWeapon reload="0.5" barrelpos="34,6" spread="0" unskilledspread="2" drawhudwhenequipped="true" crosshairscale="0.2" combatpriority="60">
@@ -435,8 +435,8 @@
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.025" />
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.025" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.05" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.05" />
     <Deconstruct time="20">
       <Item identifier="dementonite" />
       <Item identifier="dementonite" />
@@ -445,7 +445,7 @@
     <Sprite texture="AlienRuins_Items.png" depth="0.55" sourcerect="0,1776,185,96" origin="0.5,0.4" scale="0.5" />
     <Body radius="30" width="90" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" aimpos="100,0" handle1="0,11" handle2="2,11" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="-0.75" range="400" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0" combatpriority="90" firedamage="30">
+    <RepairTool structurefixamount="-0.75" range="1600" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0" combatpriority="90" firedamage="30">
       <Fixable identifier="structure" />
       <RequiredItems items="alienpowercell" type="Contained" />
       <StatusEffect type="OnUse" targettype="UseTarget" targets="weldable" Stuck="-80.0" />
@@ -471,11 +471,11 @@
         <Affliction identifier="stun" amount="4" probability="0.15" />
       </StatusEffect>
       <sound file="Content/Items/Alien/alienweapon.ogg" type="OnUse" range="1000.0" loop="true" />
-      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
+      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="2000">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
     </RepairTool>
-    <Propulsion force="-40" usablein="both">
+    <Propulsion force="-120" usablein="both">
       <RequiredItems items="alienpowercell" type="Contained" />
     </Propulsion>
     <!-- Legacy feature: can be used as a railgun ammunition. Requires "railgunammo" tag to work. Disabled because glitches with the new loaders and holders.
@@ -495,7 +495,7 @@
       </StatusEffect>
     </Projectile>
     -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="9,0">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="9,0">
       <Containable items="alienpowercell" />
     </ItemContainer>
     <Upgrade gameversion="0.1500.5.0" scale="0.5" />
@@ -523,7 +523,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="aliendoor" category="Alien" Tags="alien,door,aliendoor,weldable" damagedbyrepairtools="true" scale="0.5" health="3000">
@@ -547,7 +547,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="aliendoorsmall" nameidentifier="aliendoor" category="Alien" Tags="alien,door,aliendoor,weldable" damagedbyrepairtools="true" scale="0.5" health="1000">
@@ -570,7 +570,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="alienhatchsmall" nameidentifier="alienhatch" category="Alien" Tags="alien,door,aliendoor,weldable" damagedbyrepairtools="true" scale="0.5" health="1000">
@@ -593,7 +593,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="aliendoorsmallwbuttons" nameidentifier="aliendoorwbuttons" descriptionidentifier="aliendoor" tags="alien,door,aliendoor,weldable" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyexplosions="true" explosiondamagemultiplier="0.1" allowrotatingineditor="false" allowedlinks="structure,item" linkable="true" scale="0.5" health="1000">
@@ -615,7 +615,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="alienhatchsmallwbuttons" nameidentifier="alienhatchwbuttons" descriptionidentifier="alienhatch" allowedlinks="gap,hull,structure,item" linkable="true" tags="alien,door,aliendoor,weldable" scale="0.5" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyexplosions="true" explosiondamagemultiplier="0.1" allowrotatingineditor="false" health="1000">
@@ -637,7 +637,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="aliendoorheavy" nameidentifier="aliendoor" category="Alien" Tags="alien,door,aliendoor,weldable" damagedbyrepairtools="true" scale="0.5" health="10000">
@@ -661,7 +661,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="alienhatchheavy" nameidentifier="alienhatch" category="Alien" Tags="alien,door,aliendoor,weldable" damagedbyrepairtools="true" scale="0.5" health="10000">
@@ -685,7 +685,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="aliendoorwbuttons" descriptionidentifier="aliendoor" tags="alien,door,aliendoor,weldable" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyexplosions="true" explosiondamagemultiplier="0.1" allowrotatingineditor="false" allowedlinks="structure,item" linkable="true" scale="0.5" health="3000">
@@ -707,7 +707,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="alienhatchwbuttons" descriptionidentifier="alienhatch" allowedlinks="gap,hull,structure,item" linkable="true" tags="alien,door,aliendoor,weldable" scale="0.5" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyexplosions="true" explosiondamagemultiplier="0.1" allowrotatingineditor="false" health="3000">
@@ -730,7 +730,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="alienmotionsensor" category="Alien" Tags="alien,alienmotionsensor" scale="0.5" damagedbyexplosions="true" damagedbymeleeweapons="true" damagedbyprojectiles="true" damagedbyrepairtools="true" health="100" >
@@ -749,7 +749,7 @@
     <ConnectionPanel canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10" locked="True" allowingameediting="False">
       <RequiredItem items="screwdriver" type="Equipped" />
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
       <input name="toggle" displayname="connection.togglestate"/>
       <input name="shutdown" displayname="connection.shutdown">
         <StatusEffect type="OnUse" target="This" condition="-100" setvalue="true"/>
@@ -768,7 +768,7 @@
   </Item>
   <Item name="" identifier="artifactholder" category="Alien" Tags="alien,artifactholder,artifactcontainer">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.8" sourcerect="725,786,260,425" />
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" itempos="130,-180" containedspritedepth="0.81" autointeractwithcontained="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="1" maxstacksize="60" canbeselected="true" hideitems="false" itempos="130,-180" containedspritedepth="0.81" autointeractwithcontained="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="alienartifact" excludebroken="false">
         <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true" />
@@ -807,13 +807,13 @@
         </StatusEffect>
       </Containable>
     </ItemContainer>
-    <LightComponent AllowInGameEditing="false" lightcolor="153,204,255,200" powerconsumption="1" canbeselected="false" range="800.0" IsOn="true" castshadows="false">
+    <LightComponent AllowInGameEditing="false" lightcolor="153,204,255,200" powerconsumption="1" canbeselected="false" range="3200" IsOn="true" castshadows="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1047,1792,255,255" depth="0.025" origin="0.5,0.5" alpha="0.4" />
     </LightComponent>
-    <PowerContainer capacity="20000.0" canbeselected="false" maxrechargespeed="10000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="50" canbeselected="false" maxrechargespeed="10000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="false" hudpriority="10">
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="power_out" displayname="connection.powerout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
     </ConnectionPanel>
     <!--<DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="884,1231,136,136" depth="0.8" offset="0,300" origin="0.5,0.5"/>-->
     <!--<DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="739,1232,136,136" depth="0.79" offset="0,300" origin="0.5,0.5">
@@ -830,14 +830,14 @@
     <Sprite name="aliengenerator" texture="Content/Items/Alien/AlienRuins_Items_04.png" depth="0.8" sourcerect="515,4,506,506" />
     <DecorativeSprite name="aliengenerator_center" texture="Content/Items/Alien/AlienRuins_Items_04.png" depth="0.79" sourcerect="10,485,178,179" origin="0.5,0.5"/>
     <BrokenSprite name="aliengenerator_broken" texture="Content/Items/Alien/AlienRuins_Items_04.png" depth="0.78" sourcerect="515,515,506,506" origin="0.5,0.5" fadein="false" />
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" containedspritedepth="0.01" autointeractwithcontained="false">
+    <ItemContainer capacity="1" maxstacksize="60" canbeselected="true" hideitems="true" containedspritedepth="0.01" autointeractwithcontained="false">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <StatusEffect type="Always" target="This" Charge="-1000.0" />
       <Containable items="alienpowercell">
         <StatusEffect type="OnContaining" target="This" Charge="10000.0" setvalue="true" />
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="1000" canbeselected="true" maxrechargespeed="1000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="50" canbeselected="true" maxrechargespeed="1000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="true" hudpriority="10" locked="True" allowingameediting="False" >
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
@@ -845,7 +845,7 @@
       <input name="shutdown" displayname="connection.shutdown">
         <StatusEffect type="OnUse" target="This" condition="-100" setvalue="true" />
       </input>
-      <output name="power_out" displayname="connection.powerout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
       <StatusEffect type="OnDamaged" target="This">
         <ParticleEmitter particle="plasmaspark" drawontop="true" particleamount="5" scalemin="0.3" scalemax="0.5" velocitymin="300" velocitymax="800" anglemin="0" anglemax="360" />
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="5" scalemin="0.5" scalemax="1" anglemin="90" anglemax="90" velocitymin="50" velocitymax="100" />
@@ -857,19 +857,19 @@
         <sound file="Content/Items/Weapons/ElectricalDischarger.ogg" range="50000" dontmuffle="true" />
       </StatusEffect>
     </ConnectionPanel>
-    <LightComponent AllowInGameEditing="false" lightcolor="128,128,128,10" canbeselected="false" range="200.0" IsOn="true" powerconsumption="0">
+    <LightComponent AllowInGameEditing="false" lightcolor="128,128,128,10" canbeselected="false" range="800" IsOn="true" powerconsumption="0">
       <Upgrade gameversion="1.6.4.0" range="200.0"/>
       <Upgrade gameversion="1.6.8.0" lightcolor="128,128,128,10"/>
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_04.png" sourcerect="515,4,506,506" origin="0.5, 0.5" alpha="1.0" depth="0.71" />
     </LightComponent>
-    <LightComponent AllowInGameEditing="false" lightcolor="49,93,140,100" canbeselected="false" range="1000.0" IsOn="true" powerconsumption="0">
+    <LightComponent AllowInGameEditing="false" lightcolor="49,93,140,100" canbeselected="false" range="4000" IsOn="true" powerconsumption="0">
       <Upgrade gameversion="1.6.4.0" range="1000.0"/>
       <Upgrade gameversion="1.6.8.0" lightcolor="49,93,140,100"/>
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_04.png" sourcerect="18,681,91,94" origin="0.5, 0.5" alpha="1.0" depth="0.7" />
       <IsActiveConditional targetcontaineditem="true" HasTag="alienpowercell" conditionpercentage="gt 0"/>
     </LightComponent>
   </Item>
-  <Item name="" identifier="alienpowercell" category="Alien,Equipment" maxstacksize="8" Tags="alien,smallitem,alienpowercell" scale="0.3" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="alienpowercell" category="Alien,Equipment" maxstacksize="60" Tags="alien,smallitem,alienpowercell" scale="0.3" impactsoundtag="impact_metal_light">
     <Price baseprice="220" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
@@ -881,15 +881,15 @@
       <Item identifier="lead" />
       <Item identifier="fulgurium" />
     </Deconstruct>
-    <PreferredContainer primary="alienpistol" amount="1" spawnprobability="1.0" />
-    <PreferredContainer primary="ancientweapon" amount="1" spawnprobability="1.0" />
-    <PreferredContainer primary="wrecksecarmcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.2" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer primary="ruintreasure" minamount="2" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="researchcontainer" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="alienpistol" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="ancientweapon" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="wrecksecarmcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.4" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer primary="ruintreasure" minamount="4" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="researchcontainer" amount="2" spawnprobability="0.04" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="0,1952,34,77" depth="0.7" origin="0.5,0.5" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,30" canbeselected="false" range="100.0" IsOn="true" castshadows="false" />
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,30" canbeselected="false" range="400" IsOn="true" castshadows="false" />
     <Body radius="15" height="40" density="30" />
     <Holdable slots="RightHand,LeftHand,Any" msg="ItemMsgPickUpSelect">
       <!--<StatusEffect type="OnContained" target="Character">
@@ -963,9 +963,9 @@
     <ConnectionPanel canbeselected="true">
       <RequiredItem items="screwdriver" type="Equipped" />
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
-    <LightComponent AllowInGameEditing="false" color="183,85,214,100" IsOn="true" range="1.0" castshadows="false">
+    <LightComponent AllowInGameEditing="false" color="183,85,214,100" IsOn="true" range="4" castshadows="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="183,113,100,97" depth="0.1" origin="0.5,0.5" />
     </LightComponent>
   </Item>
@@ -1045,7 +1045,7 @@
       </StatusEffect>
     </Projectile>
     <AiTarget sonardisruption="1" sightrange="500" soundrange="100000" static="true" sonarlabel="entityname.anomaly" />
-    <LightComponent range="2048.0" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0" flickerspeed="5">
+    <LightComponent range="8192" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="1.0" flickerspeed="5">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5, 0.5" size="1.0,1.0" />
       <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
@@ -1088,7 +1088,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="endruinheavydoorhorizontal" nameidentifier="endruinheavydoor" allowedlinks="gap,hull,structure,item" linkable="true" tags="alien,door,aliendoor" category="alien" scale="1.0" health="1000" damagedbyrepairtools="false" damagedbymonsters="false" damagedbyexplosions="true" explosiondamagemultiplier="0.1" ondamagedthreshold="10" allowrotatingineditor="false">
@@ -1108,7 +1108,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="alienturret_new" nameidentifier="alienturret"  category="Alien" Tags="turret,alien" scale="0.5" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbyrepairtools="true" damagedbymeleeweapons="true" health="300">
@@ -1116,7 +1116,7 @@
     <Sprite name="alienturret" texture="Content/Items/Alien/AlienTurret.png" depth="0.7" sourcerect="4,318,251,192" canflipy="false" />
     <BrokenSprite name="alienturret_broken_gradual" texture="Content/Items/Alien/AlienTurret.png" sourcerect="257,318,251,192" depth="0.69" fadein="true" maxcondition="80" />
     <BrokenSprite name="alienturret_broken" texture="Content/Items/Alien/AlienTurret.png" sourcerect="257,318,251,192" depth="0.68" fadein="false" />
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true">
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="60" canbeselected="false" characterusable="true">
       <Containable items="alienturretammo" />
       <!-- when the turret is fired, it triggers this statuseffect and spawns new ammo -->
       <StatusEffect type="OnUse" target="Contained">
@@ -1132,7 +1132,7 @@
       <RailSpriteBroken name="alienturret_rail_broken" texture="Content/Items/Alien/AlienTurret.png" depth="0.71" sourcerect="254,0,184,316" origin="0.5,0.83" />      
       <BarrelSprite name="alienturret_barrel" texture="Content/Items/Alien/AlienTurret.png" depth="0.72" sourcerect="188,2,66,184" origin="0.5,1.57" />
       <BarrelSpriteBroken name="alienturret_barrel_broken" texture="Content/Items/Alien/AlienTurret.png" depth="0.72" sourcerect="442,2,66,184" origin="0.5,1.57" />      
-      <LightComponent LightColor="200,200,255,255" Flicker="0.0" powerconsumption="1" range="1000" directional="true" IsOn="true" pulsefrequency="1.0" pulseamount="0.2" drawbehindsubs="false" ignorecontinuoustoggle="false" InheritParentIsActive="false">
+      <LightComponent LightColor="200,200,255,255" Flicker="0.0" powerconsumption="1" range="4000" directional="true" IsOn="true" pulsefrequency="1.0" pulseamount="0.2" drawbehindsubs="false" ignorecontinuoustoggle="false" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="-0.055,0.5" size="1.0,0.3" />
       </LightComponent>     
       <StatusEffect type="OnUse" target="This">
@@ -1192,49 +1192,49 @@
   </Item>
   <Item name="" identifier="alienwritingdecal1" nameidentifier="alienwriting" Tags="alienwritingdecal" width="285" height="160" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,384,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,544,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal2" nameidentifier="alienwriting" Tags="alienwritingdecal" width="285" height="160" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,705,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,864,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal3" nameidentifier="alienwriting" Tags="alienwritingdecal" width="117" height="117" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1915,2,131,132" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1915,137,131,132" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal4" nameidentifier="alienwriting" Tags="alienwritingdecal" width="261" height="87" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,2,254,97" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,200,250,93" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal5" nameidentifier="alienwriting" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,102,255,95" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1658,296,251,91" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
     <Item name="" identifier="alienwritingdecal6" nameidentifier="alienwriting" Tags="alienwritingdecal" width="241" height="138" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienwritingdecal7" nameidentifier="alienwriting" Tags="alienwritingdecal" width="241" height="156" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
     </LightComponent>
   </Item>
   <Item name="Alien writing: force alienwriting1 event" description="A SINGER IS BORN — AUDIENCE GATHERS, [UNTRANSLATABLE?] SPREADS — OUTGROWS THE CRADLE, FORTRESS IS BUILT — TO HOUSE — TO PROTECT" nameidentifier="alienwriting" identifier="alienwriting_alienwriting1" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,384,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,544,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting1">
         <TriggerEvent identifier="alienwriting1" />
@@ -1243,7 +1243,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting2 event" description="LIFE INCUBATED UNDER ICE — CONSCIOUSNESS FORMS, KNOWLEDGE COMPOUNDS — CIVILIZATION DEVELOPS, INSULATED FROM DANGER" nameidentifier="alienwriting" identifier="alienwriting_alienwriting2" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,705,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="1123,864,285,160" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting2">
         <TriggerEvent identifier="alienwriting2" />
@@ -1252,7 +1252,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting4 event" description="THE SINGER IS ALONE - THE DEVOTED LONGING FOR [UNTRANSLATABLE?] - A BRIDGE TO BRING NIGH THE GREAT SPHERE IS BUILT" nameidentifier="alienwriting" identifier="alienwriting_alienwriting6" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting4">
         <TriggerEvent identifier="alienwriting4" />
@@ -1261,7 +1261,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting5 event" description="WHICH CAME FIRST - YOH-WEY, THE DEVOTED, THE ONES FROM THE SKY - THIS ONE DOES NOT KNOW, BUT IS SURELY ONE OF THE LAST, LEST THEY CAN QUENCH THE RADIANCE" nameidentifier="alienwriting" identifier="alienwriting_alienwriting7" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1587,241,156" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting5">
         <TriggerEvent identifier="alienwriting5" />
@@ -1270,7 +1270,7 @@
   </Item>
   <Item name="Alien writing: force alienwriting6 event" description="THE RADIANCE OF THE GREAT SPHERE - DID WE NOT UNDERSTAND OR DID WE NOT [UNTRANSLATABLE?] - THE BRIDGE CALLS IT FORTH" nameidentifier="alienwriting" identifier="alienwriting_alienwriting8" Tags="alienwritingdecal" width="264" height="87" scale="1.0" noninteractable="false" hideinmenus="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="9,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="250,1449,241,138" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
       <StatusEffect target="This" type="OnSpawn" evententitytag="alienwriting6">
         <TriggerEvent identifier="alienwriting6" />
@@ -1281,7 +1281,7 @@
   <Item name="" identifier="aliencoil" Tags="alien,aliencoil" category="Alien" damagedbyexplosions="true" damagedbymeleeweapons="true" damagedbyprojectiles="true" damagedbyrepairtools="true" health="300">
     <StaticBody width="176" height="301" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.55" sourcerect="513,1008,176,301" origin="0.5,0.5" />
-    <!--<LightComponent AllowInGameEditing="false" lightcolor="112,146,190,100" flicker="0.2" canbeselected="false" range="800.0" IsOn="true" />-->
+    <!--<LightComponent AllowInGameEditing="false" lightcolor="112,146,190,100" flicker="0.2" canbeselected="false" range="3200" IsOn="true" />-->
     <BrokenSprite name="aliencoil_broken" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.56" sourcerect="1507,893,176,301" origin="0.5,0.5" fadein="false"/>
     <ElectricalDischarger duration="0.25" range="500" rangemultiplierinwalls="5" powerconsumption="100" minvoltage="0.0">
       <Attack targetimpulse="50">
@@ -1320,20 +1320,20 @@
         <sound file="Content/Items/Weapons/ElectricalDischarger.ogg" range="50000" dontmuffle="true" />
       </StatusEffect>
     </ConnectionPanel>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="513,1315,176,301" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>  
   <Item name="" identifier="aliencoildecorative" nameidentifier="aliencoil" Tags="alien,aliencoil" category="Alien" hideinmenus="true">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.55" sourcerect="513,1008,176,301" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" powerconsumption="1" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="513,1315,176,301" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="toxinsvent" aliases="alienvent" category="Alien" tags="alien,toxinsvent" scale="0.5" linkable="false" >
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.91" sourcerect="203,512,53,52" />
-    <LightComponent range="200" castshadows="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,100" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,100" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.91" sourcerect="203,512,53,52" />
       <sound file="Content/Items/Alien/AlienPump.ogg" type="OnActive" range="400.0" loop="true" />
       <StatusEffect type="OnActive" target="This">
@@ -1361,23 +1361,23 @@
   </Item>
   <Item name="" identifier="alienitemcontainersmall" category="Alien" tags="aliencontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="1,130,146,92" origin="0.5,0.5" />
-    <ItemContainer capacity="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="3">
+    <ItemContainer capacity="18" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="5">
       <GuiFrame relativesize="0.16,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,alienartifact" />
+      <Containable items="smallitem,mediumitem,alienartifact,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="alienitemcontainermedium" category="Alien" tags="aliencontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="1,0,176,129" origin="0.5,0.5" />
-    <ItemContainer capacity="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="4">
+    <ItemContainer capacity="24" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="5">
       <GuiFrame relativesize="0.2,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,alienartifact" />
+      <Containable items="smallitem,mediumitem,alienartifact,ammobox,deepdiving,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="alienitemcontainerlarge" category="Alien" tags="aliencontainer" linkable="true" pickdistance="150" scale="0.5">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="289,0,252,216" origin="0.5,0.5" />
-    <ItemContainer capacity="12" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="4">
+    <ItemContainer capacity="36" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="6">
       <GuiFrame relativesize="0.2,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem,largeitem,alienartifact" />
+      <Containable items="smallitem,mediumitem,largeitem,alienartifact,ammobox,deepdiving" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="alienlightcomponent" category="Alien" Tags="smallitem,alienlight" cargocontaineridentifier="metalcrate">
@@ -1399,9 +1399,9 @@
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="0,1022,464,340" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1040,1022,464,340" depth="0.799" origin="0.5,0.5" scale="true" />
     <Body radius="150" bodytype="Static" />
-    <ItemContainer capacity="9" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="3" accessonlywhenbroken="true">
+    <ItemContainer capacity="27" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="6" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.2,0.3" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       <StatusEffect Type="OnBroken" target="This">
         <ParticleEmitter particle="whitegoosplash" drawontop="true" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1" />
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="10" scalemin="0.5" scalemax="1" anglemin="45" anglemax="135" velocitymin="100" velocitymax="200" />
@@ -1414,7 +1414,7 @@
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.84" sourcerect="21,1367,395,395" origin="0.5,0.5" />
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="226,700,301,296" depth="0.78" origin="0.5,0.5" offset="0,-375" />
     <BrokenSprite name="gravitysphere_broken" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.83" sourcerect="2048,2048,395,395" origin="0.5,0.5" fadein="false" />
-    <LightComponent range="600" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
+    <LightComponent range="2400" lightcolor="140,197,180,111" IsOn="true" castshadows="true" allowingameediting="false" flicker="0.2" flickerspeed="5.0" pulsefrequency="0.2" pulseamount="0.4">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" origin="0.5,0.5" />
       <StatusEffect type="OnActive" target="This">
         <sound file="Content/Items/Alien/ALIEN_gravitySphereLoop.ogg" range="800.0" loop="true" dontmuffle="true" />
@@ -1453,7 +1453,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
       <!--Break the item when a shutdown signal is received-->
       <input name="shutdown" displayname="connection.shutdown">
         <StatusEffect type="OnUse" target="This" condition="-100" setvalue="true" />
@@ -1481,17 +1481,17 @@
       <TerminalButton style="alienbuttonblue" Signal="1"/>
       <TerminalButton style="alienbuttonred" Signal="1"/>
     </ButtonTerminal>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="1" maxstacksize="60" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true">
       <Containable items="smallitem" />
     </ItemContainer>
     <ConnectionPanel selectkey="Action" canbeselected="true" hudpriority="10" locked="True" allowingameediting="False">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
       <output name="signal_out2" displayname="connection.signaloutx~[num]=2">
         <StatusEffect type="OnUse" target="this" Condition="-1000" setvalue="true" />
       </output>
-      <output name="state_out" displayname="connection.stateout" />
+      <output name="state_out" displayname="connection.stateout" maxwires=10 />
       <!--Break the item when a shutdown signal is received-->
       <input name="shutdown" displayname="connection.shutdown" >
         <StatusEffect type="OnUse" target="This" condition="-100" setvalue="true" />
@@ -1503,11 +1503,11 @@
       </StatusEffect>
       <StatusEffect type="OnBroken" target="Contained" Condition="-1000" setvalue="true" />
     </ConnectionPanel>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="532,954,60,54" depth="0.1" origin="1.05,0.38" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" HasTag="smallalienartifact" conditionpercentage="gt 0" />
     </LightComponent>
-    <LightComponent range="1.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="4" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="534,878,157,76" depth="0.1" origin="0.5,0.5" alpha="0.7" />
       <IsActiveConditional targetitemcomponent="connectionpanel" conditionpercentage="gt 0" />
     </LightComponent>
@@ -1529,9 +1529,9 @@
       <Price storeidentifier="merchantmine" />
     </Price>
     <PreferredContainer primary="reactorcab" secondary="engcab" />
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.02" />
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="researchcontainer" amount="1" spawnprobability="0.01" />
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.04" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="researchcontainer" amount="2" spawnprobability="0.02" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="251,833,60,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="323,1950,90,90" depth="0.8" origin="0.5,0.5" />
     <Body width="90" height="90" density="8" />
@@ -1543,26 +1543,26 @@
   </Item>
   <Item name="" nameidentifier="RuinDecal1" identifier="ruinpipeconnection" description="" width="64" height="80" texturescale="0.5,0.5" scale="0.5" noninteractable="true" category="Alien">
     <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="960,256,64,80" depth="0.9" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="896,256,64,80" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Upgrade gameversion="0.15.9.0" noninteractable="true" />
   </Item>
   <Item name="" nameidentifier="RuinDecal1" identifier="ruinpipeconnectioncorner" description="" width="70" height="80" texturescale="0.5,0.5" scale="0.5" noninteractable="true" category="Alien">
     <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="955,342,70,70" depth="0.9" premultiplyalpha="false" origin="0.55,0.5" />
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/AlienWallSet1.png" sourcerect="890,342,63,70" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" nameidentifier="RuinDecal1" identifier="ruindecalpulse1" width="64" height="80" texturescale="0.5,0.5" scale="0.5" noninteractable="true" category="Alien">
     <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="0,1,406,401" depth="0.9" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="0.0" lightcolor="111,111,255,33" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.25">
+    <LightComponent range="0" lightcolor="111,111,255,33" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.25">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="433,0,404,402" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="0.0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
+    <LightComponent range="0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="836,1,406,405" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="0.0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.6">
+    <LightComponent range="0" lightcolor="111,111,255,11" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.6">
       <sprite texture="Content/Map/AlienRuins_LevelAssets1.png" sourcerect="1240,3,406,402" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Upgrade gameversion="0.15.9.0" noninteractable="true" />
@@ -1589,7 +1589,7 @@
       <!-- keep the AI target active when the item is active -->
       <StatusEffect type="OnActive" target="This" sightrange="5000" soundrange="5000" setvalue="true" />
     </ItemComponent>
-    <LightComponent range="200" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+    <LightComponent range="800" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1704,504,338,658" origin="0.5,0.5" size="1,1" alpha="1.0" />
       <IsActive targetitemcomponent="TriggerComponent" triggeractive="true" />
     </LightComponent>
@@ -1604,7 +1604,7 @@
       <input name="shutdown" displayname="connection.shutdown">
         <StatusEffect type="OnUse" target="This" condition="-1000" setvalue="true" />
       </input>
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
       <StatusEffect type="OnDamaged" target="This">
         <Sound file="Content/Items/Alien/DAMAGE_guardianPodImpact1.ogg" range="3000" selectionmode="Random" />
         <Sound file="Content/Items/Alien/DAMAGE_guardianPodImpact2.ogg" range="3000" selectionmode="Random" />
@@ -1670,7 +1670,7 @@
         <AITrigger state="Idle" duration="1" allowtobeoverridden="false" allowtooverride="true" />
       </StatusEffect>
     </ItemComponent>
-    <LightComponent range="200" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+    <LightComponent range="800" lightcolor="255,62,62,255" IsOn="false" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1704,504,338,658" origin="0.5,0.5" size="1,1" alpha="1.0" />
       <IsActive targetitemcomponent="TriggerComponent" hasstatustag="repairactive" />
     </LightComponent>
@@ -1685,7 +1685,7 @@
       <input name="shutdown" displayname="connection.shutdown">
         <StatusEffect type="OnUse" target="This" condition="-1000" setvalue="true" />
       </input>
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
       <StatusEffect type="OnDamaged" target="This">
         <Sound file="Content/Items/Alien/DAMAGE_guardianPodImpact1.ogg" range="3000" selectionmode="Random" />
         <Sound file="Content/Items/Alien/DAMAGE_guardianPodImpact2.ogg" range="3000" selectionmode="Random" />
@@ -1715,19 +1715,19 @@
   </Item>
   <Item name="" identifier="alienlight1" nameidentifier="ruinlight" width="100" height="50" texturescale="1.0,1.0" scale="0.5" category="Alien" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1030,0,100,50" depth="0.94" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="150.0" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="600" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1030,62,100,50" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienlight2" nameidentifier="ruinlight" width="50" height="100" texturescale="1.0,1.0" scale="0.5" category="Alien" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1029,116,50,100" depth="0.94" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="150.0" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="600" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1080,116,50,100" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="alienlight3" nameidentifier="ruinlight" width="76" height="70" texturescale="1.0,1.0" scale="0.5" category="Alien" spritecolor="255,255,255,255" noninteractable="true">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1137,0,76,70" depth="0.94" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="150.0" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="600" lightcolor="246,165,255,250" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1218,0,76,70" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -1736,7 +1736,7 @@
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="21,1367,395,395" depth="0.75" origin="0.5,0.5" offset="0,0" scale="1.2" rotationspeed="300" />
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" offset="0,0" rotationspeed="-350" />
     <AiTarget sonardisruption="1" sightrange="500" soundrange="100000" static="true" sonarlabel="entityname.anomaly" />
-    <LightComponent range="2048.0" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
+    <LightComponent range="8192" lightcolor="255,200,15,255" IsOn="true" castshadows="false" allowingameediting="false" flicker="0.1" flickerspeed="5">
       <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <Sound file="Content/Items/Alien/AlienPump.ogg" range="20000" position="0,0" />
@@ -1762,7 +1762,7 @@
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="21,1367,395,395" depth="0.75" origin="0.5,0.5" offset="0,0" scale="1.2" rotationspeed="300" />
     <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" offset="0,0" rotationspeed="-350" />
     <Body radius="20" bodytype="Static" />
-    <LightComponent range="2048.0" lightcolor="255,200,15,255" IsOn="true" castshadows="true" allowingameediting="false" flicker="1.0" flickerspeed="5" pulseamount="0.2" pulsefrequency="2">
+    <LightComponent range="8192" lightcolor="255,200,15,255" IsOn="true" castshadows="true" allowingameediting="false" flicker="1.0" flickerspeed="5" pulseamount="0.2" pulsefrequency="2">
       <DecorativeSprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.7" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <Sound file="Content/Items/Alien/AlienPump.ogg" range="20000" position="0,0" />
@@ -1775,7 +1775,7 @@
         <Affliction identifier="hallucinating" strength="20" />
       </StatusEffect>
     </LightComponent>
-    <LightComponent range="2048.0" lightcolor="255,210,150,255" IsOn="true" castshadows="true" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.6" />    
+    <LightComponent range="8192" lightcolor="255,210,150,255" IsOn="true" castshadows="true" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.6" />    
   </Item>
   <Item name="submarinepusher" identifier="submarinepusher" texturescale="1.0,1.0" scale="5" category="Alien" spritecolor="255,255,255,100" noninteractable="true" hideinmenus="true">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1075,1367,395,395" depth="0.8" origin="0.5,0.5" offset="0,0" />
@@ -1799,7 +1799,7 @@
     <Sprite name="guardianpod" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,385,210,210" depth="0.03" origin="0.5,0.5" />
     <BrokenSprite name="guardianpod_broken_gradual" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,598,210,210" origin="0.5,0.5" depth="0.02" fadein="true" maxcondition="99" />
     <BrokenSprite name="guardianpod_broken" texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,598,210,210" origin="0.5,0.5" depth="0.01" fadein="false" />
-    <LightComponent range="200" lightcolor="255,62,62,255" IsOn="true" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
+    <LightComponent range="800" lightcolor="255,62,62,255" IsOn="true" castshadows="false" allowingameediting="false" vulnerabletoemp="false" flicker="0.8" flickerspeed="0.1" pulsefrequency="0.1" pulseamount="0.1">
       <sprite texture="Content/Items/Alien/EndRuin_Items.png" sourcerect="912,813,210,210" origin="0.5,0.5" size="1,1" alpha="1.0" />
       <StatusEffect type="OnActive" target="This">
         <sound file="Content/Items/Alien/AlienArtifactLoop1.ogg" range="10000.0" loop="true" volume="0.1" frequencymultiplier="0.5" />
@@ -1909,7 +1909,7 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" containedstateindicatorstyle="spear">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" containedstateindicatorstyle="spear">
       <Containable items="guardianspear" />
     </ItemContainer>
   </Item>
@@ -1917,7 +1917,7 @@
     <Sprite texture="Content/Characters/Fractalguardian/Fractalguardian.png" sourcerect="214,514,130,64" depth="0.55" origin="0.5,0.5" />
     <Body width="100" height="35" density="30" />
     <Holdable slots="Any,RightHand" controlpose="false" aimpos="120,0" handle1="-55,0" holdangle="0" usehandrotationforholdangle="true" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="0.0" range="500" barrelpos="45,0" fireprobability="0.0" spread="25">
+    <RepairTool structurefixamount="0.0" range="2000" barrelpos="45,0" fireprobability="0.0" spread="25">
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="10" velocitymax="100" />
       <ParticleEmitter particle="steamspray" particlespersecond="80" anglemin="0" anglemax="0" velocitymin="300" velocitymax="500" highqualitycollisiondetection="true" />
       <ParticleEmitter particle="bubbles" particlespersecond="20" anglemin="-10" anglemax="10" scalemin="0.3" scalemax="0.7" velocitymin="5" velocitymax="100" copyentityangle="true" />
@@ -1935,7 +1935,7 @@
     <Sprite texture="AlienRuins_Items.png" depth="0.55" sourcerect="0,1776,185,96" origin="0.5,0.4" scale="0.5" />
     <Body width="85" height="40" density="15" />
     <Holdable slots="Any,RightHand" controlpose="false" aimpos="120,0" handle1="0,11" holdangle="0" usehandrotationforholdangle="true" msg="ItemMsgPickUpSelect" />
-    <RepairTool structurefixamount="-0.75" range="400" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0">
+    <RepairTool structurefixamount="-0.75" range="1600" barrelpos="75,0" targetforce="50" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-20.0">
       <Fixable identifier="structure" />
       <StatusEffect type="OnUse" targettype="UseTarget" targets="weldable" Stuck="-80.0" />
       <!--Damage doors-->
@@ -1952,7 +1952,7 @@
         <Affliction identifier="radiationsickness" amount="25" />
       </StatusEffect>
       <sound file="Content/Items/Alien/alienweapon.ogg" type="OnUse" range="800.0" loop="true" />
-      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="500">
+      <LightComponent AllowInGameEditing="false" LightColor="0.8,0.7,1.0,1.0" Flicker="0.5" range="2000">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
       <!-- remove if the weapon ends up outside the guardian's inventory (arm severed?) -->
@@ -2057,7 +2057,7 @@
         <Remove />
       </StatusEffect>
     </RangedWeapon>
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true">
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="60" canbeselected="false" characterusable="true">
       <Containable items="alienturretammoemp" />
     </ItemContainer>
   </Item>
@@ -2161,7 +2161,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling/Spineling.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -2179,7 +2179,7 @@
         <Affliction identifier="morbusinepoisoning" strength="3" probability="0.1" />
       </Attack>
     </Projectile>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,255,200,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,255,200,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling_morbusine/Spineling_morbusine.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -2216,7 +2216,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent range="400" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,255,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="1600" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="255,255,255,30" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling_giant/Spineling_giant.png" sourcerect="0,940,720,72" origin="0.55,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
@@ -2249,7 +2249,7 @@
         </Explosion>
       </StatusEffect>
     </Holdable>
-    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="80" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="327,165,35,38" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <aitarget sightrange="1000" static="true" />
@@ -2290,7 +2290,7 @@
         </Explosion>
       </StatusEffect>
     </Projectile>
-    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="80" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="327,165,35,38" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -2412,23 +2412,23 @@
     <Sprite name="alienstoragevat" texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.8" sourcerect="397,456,168,172" origin="0.5,0.5" />
     <BrokenSprite name="alienstoragevat_broken" texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="567,456,168,172" depth="0.799" origin="0.5,0.5" scale="true" />
     <Body width="150" height="150" bodytype="static"/>
-    <ItemContainer capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
+    <ItemContainer capacity="12" slotsperrow="4" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI"/>
-      <Containable items="smallitem,mediumitem"/>
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem"/>
       <StatusEffect type="OnBroken" target="this">
         <ParticleEmitter particle="whitegoosplash" drawontop="true" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1"/>
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="10" scalemin="0.5" scalemax="1" anglemin="45" anglemax="135" velocitymin="100" velocitymax="200"/>
         <Sound file="Content/Map/Thalamus/Sounds/CARRIER_organs2.ogg" range="500" volume="0.2"/>
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="748,465,162,155" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliencurrentgenerator" category="Alien" Tags="alien" scale="0.5" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbyrepairtools="true" damagedbymeleeweapons="true" health="300">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.8" sourcerect="1856,0,171,447" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="1856,459,171,447" depth="0.799" origin="0.5,0.5" scale="true" />
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="1858,929,168,439" origin="0.5,0.5" alpha="0.5" />
       <StatusEffect type="OnActive" target="This">
         <ParticleEmitter particle="bubbles" copyentityangle="true" VelocityMin="500" VelocityMax="550" ScaleMax="1.5" ParticlesPerSecond="100" LifeTimeMultiplier="1.2" />
@@ -2470,16 +2470,16 @@
     <Sprite name="assemblydevice_bubble" texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.79" sourcerect="2,8,151,154" origin="0.5,0.5" />
     <BrokenSprite name="assemblydevice_bubble_broken" texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="173,8,151,154" depth="0.78" origin="0.5,0.5" scale="true" />
     <TriggerComponent radius="80" triggeredby="Item" sensor="false" />
-    <ItemContainer capacity="4" slotsperrow="2" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
+    <ItemContainer capacity="12" slotsperrow="4" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect" accessonlywhenbroken="true">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI"/>
-      <Containable items="smallitem,mediumitem"/>
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem"/>
       <StatusEffect type="OnBroken" target="this">
         <ParticleEmitter particle="whitegoosplash" drawontop="true" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1"/>
         <ParticleEmitter particle="damagebubbles" drawontop="true" particleamount="10" scalemin="0.5" scalemax="1" anglemin="45" anglemax="135" velocitymin="100" velocitymax="200"/>
         <Sound file="Content/Map/Thalamus/Sounds/CARRIER_organs2.ogg" range="500" volume="0.2"/>
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="84,184,131,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="84,184,131,200" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite name="alienassemblydevice_bubble_light" texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="2,177,151,154" origin="0.48,0.48" alpha="0.3" />
       <IsActiveConditional targetitemcomponent="Itemcontainer" isBroken="false"/>
     </LightComponent>
@@ -2488,7 +2488,7 @@
     <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" depth="0.8" sourcerect="383,15,475,414" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="863,15,475,414" depth="0.799" origin="0.5,0.5" scale="true" />
     <Body width="450" height="400" bodytype="Static" />   
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="143,236,166,200" pulsefrequency="0.3" pulseamount="0.2" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Items/Alien/AlienRuins_Items_02.png" sourcerect="1348,15,475,414" origin="0.5,0.5" alpha="0.5" />
     </LightComponent>
     <ConnectionPanel canbeselected="true" hudpriority="10" locked="True" allowingameediting="False">
@@ -2549,24 +2549,24 @@
     <DecorativeSprite name="aliensample2" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.95" sourcerect="1766,1700,272,174" origin="0.5,0.5" randomgroupid="1" offset="30,30" offsetanim="Noise" rotationanim="Noise" rotation="25" rotationspeed="0.1" offsetanimspeed="0.02" />
     <DecorativeSprite name="aliensample3" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.95" sourcerect="1304,1861,246,177" origin="0.5,0.5" randomgroupid="1" offset="30,30" offsetanim="Noise" rotationanim="Noise" rotation="25" rotationspeed="0.1" offsetanimspeed="0.02" />
     <DecorativeSprite name="aliensample4" texture="Content/Items/Alien/AlienRuins_Items.png" depth="0.95" sourcerect="1889,1204,159,158" origin="0.5,0.5" randomgroupid="1" offset="30,30" offsetanim="Noise" rotationanim="Noise" rotation="25" rotationspeed="0.1" offsetanimspeed="0.02" />
-    <LightComponent range="512" lightcolor="255,255,255,128" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="2048" lightcolor="255,255,255,128" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="1504,1456,421,235" depth="0.97" premultiplyalpha="false" origin="0.5,0.59" />
     </LightComponent>
-    <ItemContainer capacity="4" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="2" accessonlywhenbroken="false">
+    <ItemContainer capacity="12" canbeselected="True" hideitems="true" msg="ItemMsgInteractSelect" slotsperrow="4" accessonlywhenbroken="false">
       <GuiFrame relativesize="0.18,0.25" anchor="Center" style="ItemUI"/>
-      <Containable items="smallitem,mediumitem"/>
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem"/>
     </ItemContainer>
   </Item>
   <Item name="" identifier="joviansystemhologram" category="Alien" Tags="alien" scale="1.0" noninteractable="true" spritecolor="175,125,255">
     <Sprite texture="Content/Items/Alien/AlienRuins_Items_03.png" sourcerect="0,0,10,10" depth="0.5" origin="0.5,0.5" />
     
-    <LightComponent range="150" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.2" pulseamount="0.2" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="600" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.2" pulseamount="0.2" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <StatusEffect type="Always" target="This">
         <ParticleEmitter particle="hologramsphere" particlespersecond="25" scalemultiplier="0.5,0.5"/>
       </StatusEffect>
     </LightComponent>
-    <LightComponent range="300" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.3" pulseamount="0.8" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="1200" castshadows="False" drawbehindsubs="False" ison="True" pulsefrequency="0.3" pulseamount="0.8" blinkfrequency="0" lightcolor="200,200,255,255" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     
@@ -2592,90 +2592,90 @@
   
   <Item name="" identifier="aliensymbol01" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol02" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol03" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="435,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol04" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol05" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol06" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="502,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol07" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol08" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol09" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="569,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol10" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1844,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol11" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1911,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
   <Item name="" identifier="aliensymbol12" nameidentifier="aliensymbol" Tags="alien" width="63" height="63" scale="1.0" noninteractable="true" category="alien, Decorative">
     <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" />
-    <LightComponent range="256" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
+    <LightComponent range="1024" lightcolor="100,153,153,102" powerconsumption="0" IsOn="true" pulsefrequency="0.3" pulseamount="0.2" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="636,1978,63,63" depth="0.97" premultiplyalpha="false" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
 
   <Item name="" identifier="aliengenerator" category="Legacy" Tags="alien,aliengenerator" scale="0.3">
     <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" depth="0.8" sourcerect="512,0,512,573" />
-    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="800.0" IsOn="true">
+    <LightComponent AllowInGameEditing="false" lightcolor="112,146,190,50" canbeselected="false" range="3200" IsOn="true">
       <Sprite texture="Content/Items/Alien/Legacy/AlienRuin_Legacy.png" sourcerect="0,486,176,176" origin="0.47, 0.3" alpha="1.0" />
     </LightComponent>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="false" itempos="264,-321" containedspritedepth="0.01" autointeractwithcontained="true">
+    <ItemContainer capacity="1" maxstacksize="60" canbeselected="true" hideitems="false" itempos="264,-321" containedspritedepth="0.01" autointeractwithcontained="true">
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <StatusEffect type="Always" target="This" Charge="-10.0" />
       <Containable items="alienpowercell">
         <StatusEffect type="OnContaining" target="This" Charge="100.0" setvalue="true" />
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="10.0" canbeselected="false" maxrechargespeed="1000.0" maxoutput="10000.0" />
+    <PowerContainer capacity="30" canbeselected="false" maxrechargespeed="1000.0" maxoutput="10000.0" />
     <ConnectionPanel canbeselected="true" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
@@ -2683,13 +2683,13 @@
       <input name="shutdown" displayname="connection.shutdown">
         <StatusEffect type="OnUse" target="This" condition="-100" setvalue="true" />
       </input>
-      <output name="power_out" displayname="connection.powerout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
   <Item name="" identifier="alienturret" category="Legacy" Tags="turret,alien" scale="0.5" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbyrepairtools="true" damagedbymeleeweapons="true" health="1000">
     <Sprite texture="Content/Items/Alien/EndRuin_Items.png" depth="0.4" sourcerect="384,768,455,256" canflipy="false" />
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" canbeselected="false" characterusable="true">
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="60" canbeselected="false" characterusable="true">
       <Containable items="alienturretammo" />
       <!-- when the turret is fired, it triggers this statuseffect and spawns new ammo -->
       <StatusEffect type="OnUse" target="Contained">
@@ -2724,10 +2724,10 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
-      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
+      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" maxwires=10 />
     </ConnectionPanel>
-    <LightComponent range="0.0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Alien/AlienRuins_Items.png" sourcerect="532,878,160,79" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Content/Items/Assemblies/AirlockDoors.xml b/Content/Items/Assemblies/AirlockDoors.xml
index d29604b6..a90b0b6c 100644
--- a/Content/Items/Assemblies/AirlockDoors.xml
+++ b/Content/Items/Assemblies/AirlockDoors.xml
@@ -33,7 +33,7 @@
       <input name="set_state">
         <link w="23" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="bluewire" ID="27" rect="50107,-15088,42,16" noninteractable="False" nonplayerteaminteractable="False" allowswapping="True" rotation="0" scale="0.5" spritecolor="51,121,173,255" inventoryiconcolor="51,121,173,255" containercolor="255,255,255,255" condition="100" invulnerabletodamage="False" tags="smallitem,wire" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/AirlockPump.xml b/Content/Items/Assemblies/AirlockPump.xml
index 900fd45e..a1621667 100644
--- a/Content/Items/Assemblies/AirlockPump.xml
+++ b/Content/Items/Assemblies/AirlockPump.xml
@@ -54,7 +54,7 @@
       <output name="signal_out">
         <link w="13" />
       </output>
-      <output name="water_%" />
+      <output name="water_%" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="smallpump" ID="12" rect="-47,39,64,48" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="pump" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.8" hiddeningame="False">
diff --git a/Content/Items/Assemblies/AlienCellBottom.xml b/Content/Items/Assemblies/AlienCellBottom.xml
index 095c5ad8..170f997d 100644
--- a/Content/Items/Assemblies/AlienCellBottom.xml
+++ b/Content/Items/Assemblies/AlienCellBottom.xml
@@ -13,7 +13,7 @@
         <link w="20" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Alien Button" identifier="alienbutton" ID="17" rect="96,192,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
diff --git a/Content/Items/Assemblies/AlienCellTop.xml b/Content/Items/Assemblies/AlienCellTop.xml
index 1458d4fa..2b118cb6 100644
--- a/Content/Items/Assemblies/AlienCellTop.xml
+++ b/Content/Items/Assemblies/AlienCellTop.xml
@@ -13,7 +13,7 @@
         <link w="15" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Alien Button" identifier="alienbutton" ID="12" rect="-176,-128,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
diff --git a/Content/Items/Assemblies/AlienChestLarge.xml b/Content/Items/Assemblies/AlienChestLarge.xml
index 5151beec..60a04e63 100644
--- a/Content/Items/Assemblies/AlienChestLarge.xml
+++ b/Content/Items/Assemblies/AlienChestLarge.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ItemAssembly name="AlienChestLarge" description="" hideinmenus="true">
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="2" rect="-18,58,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="80" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="320" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienChestSmall.xml b/Content/Items/Assemblies/AlienChestSmall.xml
index b31484b8..16d75869 100644
--- a/Content/Items/Assemblies/AlienChestSmall.xml
+++ b/Content/Items/Assemblies/AlienChestSmall.xml
@@ -4,7 +4,7 @@
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="0,0,0,0,0" />
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="3" rect="-18,42,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="80" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="320" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,165" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienDoorAssembly1.xml b/Content/Items/Assemblies/AlienDoorAssembly1.xml
index 53b66429..e2753f89 100644
--- a/Content/Items/Assemblies/AlienDoorAssembly1.xml
+++ b/Content/Items/Assemblies/AlienDoorAssembly1.xml
@@ -10,7 +10,7 @@
         <link w="12" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Alien Button" identifier="alienbutton" ID="7" rect="-128,40,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
diff --git a/Content/Items/Assemblies/AlienDoorAssembly2.xml b/Content/Items/Assemblies/AlienDoorAssembly2.xml
index 4cd5a5de..5ba20c42 100644
--- a/Content/Items/Assemblies/AlienDoorAssembly2.xml
+++ b/Content/Items/Assemblies/AlienDoorAssembly2.xml
@@ -325,7 +325,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="43" rect="175,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -336,7 +336,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="42" rect="239,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -347,7 +347,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="41" rect="-272,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -358,7 +358,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="39" rect="-208,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -369,7 +369,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="38" rect="-144,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -380,7 +380,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="37" rect="112,48,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienDoorAssembly5.xml b/Content/Items/Assemblies/AlienDoorAssembly5.xml
index f18dcffe..0188f6ab 100644
--- a/Content/Items/Assemblies/AlienDoorAssembly5.xml
+++ b/Content/Items/Assemblies/AlienDoorAssembly5.xml
@@ -143,7 +143,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="28" rect="64,84,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -154,7 +154,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="27" rect="-96,63,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -165,7 +165,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="26" rect="64,63,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
@@ -176,7 +176,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="25" rect="-96,84,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="0,255,255,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienDoorw2Terminals.xml b/Content/Items/Assemblies/AlienDoorw2Terminals.xml
index a3288ab3..3a6e4a9a 100644
--- a/Content/Items/Assemblies/AlienDoorw2Terminals.xml
+++ b/Content/Items/Assemblies/AlienDoorw2Terminals.xml
@@ -16,7 +16,7 @@
         <link w="17" />
         <link w="18" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
diff --git a/Content/Items/Assemblies/AlienDoorwTerminal.xml b/Content/Items/Assemblies/AlienDoorwTerminal.xml
index 295ad853..6928c7f5 100644
--- a/Content/Items/Assemblies/AlienDoorwTerminal.xml
+++ b/Content/Items/Assemblies/AlienDoorwTerminal.xml
@@ -14,7 +14,7 @@
         <link w="11" />
         <link w="12" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   
diff --git a/Content/Items/Assemblies/AlienGeneratorCharged.xml b/Content/Items/Assemblies/AlienGeneratorCharged.xml
index 207866fc..88c7dd24 100644
--- a/Content/Items/Assemblies/AlienGeneratorCharged.xml
+++ b/Content/Items/Assemblies/AlienGeneratorCharged.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ItemAssembly name="ChargedAlienGenerator" description="" hideinmenus="true">
   <Item name="Alien Power Cell" identifier="alienpowercell" ID="5" rect="-134,-121,12,15" description="" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.7" scale="0.3" hideinassemblypreview="true">
-    <LightComponent range="100" castshadows="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="400" castshadows="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="0,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="4" rect="-64,96,153,171" description="" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="3200" castshadows="True" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ItemContainer pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="5" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="30" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ConnectionPanel locked="False" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" msg="" />
       <input name="shutdown" />
-      <output name="power_out" />
+      <output name="power_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
 </ItemAssembly>
\ No newline at end of file
diff --git a/Content/Items/Assemblies/AlienHatchAssembly.xml b/Content/Items/Assemblies/AlienHatchAssembly.xml
index c7b427e3..867ee9e9 100644
--- a/Content/Items/Assemblies/AlienHatchAssembly.xml
+++ b/Content/Items/Assemblies/AlienHatchAssembly.xml
@@ -8,7 +8,7 @@
         <link w="14" />
       </output>
     </ConnectionPanel>
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
   </Item>
   <Item name="" identifier="alienbutton" ID="6" rect="-17,112,24,27" noninteractable="False" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,alien,alienbutton" displaysidebysidewhenlinked="False" spritedepth="0.8" hiddeningame="False">
     <Controller istoggle="False" pickingtime="0" canbepicked="True" allowingameediting="False" msg="itemmsgpressselect" />
@@ -18,7 +18,7 @@
         <link w="13" />
       </output>
     </ConnectionPanel>
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
   </Item>
   <Item name="" identifier="blackwire" ID="14" rect="50040,-70086,48,20" noninteractable="False" scale="0.5" spritecolor="49,49,49,255" inventoryiconcolor="49,49,49,255" containercolor="255,255,255,255" condition="100" tags="smallitem,wire" displaysidebysidewhenlinked="False" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
@@ -38,7 +38,7 @@
         <link w="14" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Gap ID="11" horizontal="false" rect="-104,37,208,58" />
diff --git a/Content/Items/Assemblies/AlienHatchAssembly2.xml b/Content/Items/Assemblies/AlienHatchAssembly2.xml
index 6ce28b6e..2e5ccff2 100644
--- a/Content/Items/Assemblies/AlienHatchAssembly2.xml
+++ b/Content/Items/Assemblies/AlienHatchAssembly2.xml
@@ -9,7 +9,7 @@
         <link w="21" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Alien Hatch" identifier="alienhatch" ID="6" rect="-112,-64,208,48" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
@@ -21,7 +21,7 @@
         <link w="20" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Alien Hatch" identifier="alienhatch" ID="5" rect="-112,128,208,48" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
@@ -33,7 +33,7 @@
         <link w="19" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Black Wire" identifier="blackwire" ID="27" rect="5736,-1030,48,20" hiddeningame="False" spritecolor="50,50,50,255" inventoryiconcolor="50,50,50,255" containercolor="255,255,255,255" condition="100" tags="smallitem,wire" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/AlienHatchw2Terminals.xml b/Content/Items/Assemblies/AlienHatchw2Terminals.xml
index 74f6aac7..55e7a5f2 100644
--- a/Content/Items/Assemblies/AlienHatchw2Terminals.xml
+++ b/Content/Items/Assemblies/AlienHatchw2Terminals.xml
@@ -16,7 +16,7 @@
         <link w="17" />
         <link w="18" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
diff --git a/Content/Items/Assemblies/AlienHatchwTerminal.xml b/Content/Items/Assemblies/AlienHatchwTerminal.xml
index 4f5eba55..9bf403eb 100644
--- a/Content/Items/Assemblies/AlienHatchwTerminal.xml
+++ b/Content/Items/Assemblies/AlienHatchwTerminal.xml
@@ -14,7 +14,7 @@
         <link w="11" />
         <link w="12" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
diff --git a/Content/Items/Assemblies/AlienPumpAssembly.xml b/Content/Items/Assemblies/AlienPumpAssembly.xml
index 753e73cc..91a40a42 100644
--- a/Content/Items/Assemblies/AlienPumpAssembly.xml
+++ b/Content/Items/Assemblies/AlienPumpAssembly.xml
@@ -17,13 +17,13 @@
     </Repairable>
   </Item>
   <Item name="Alien Power Cell" identifier="alienpowercell" ID="4" rect="5722,-745,12,15" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien,smallitem" displaysidebysidewhenlinked="False" spritedepth="0.7" scale="0.3" hideinassemblypreview="true">
-    <LightComponent range="100" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="400" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="0,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="3" rect="63,80,153,171" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="3200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ItemContainer itempos="264,-321" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" contained="4" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="30" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="shutdown" />
diff --git a/Content/Items/Assemblies/AlienPumpAssembly1.xml b/Content/Items/Assemblies/AlienPumpAssembly1.xml
index 49975aa7..01a6d9ec 100644
--- a/Content/Items/Assemblies/AlienPumpAssembly1.xml
+++ b/Content/Items/Assemblies/AlienPumpAssembly1.xml
@@ -22,13 +22,13 @@
     </Repairable>
   </Item>
   <Item name="Alien Power Cell" identifier="alienpowercell" ID="6" rect="5722,-713,12,15" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien,smallitem" displaysidebysidewhenlinked="False" spritedepth="0.7" scale="0.3" hideinassemblypreview="true">
-    <LightComponent range="100" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="400" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,30" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="0,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="" />
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="3" rect="79,80,153,171" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="3200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ItemContainer itempos="264,-321" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" contained="6" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="30" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="shutdown" />
@@ -97,12 +97,12 @@
         <link w="39" />
       </input>
       <input name="set_state" />
-      <output name="power_out" />
+      <output name="power_out" maxwires=10 />
       <output name="signal_out1">
         <link w="19" />
       </output>
-      <output name="signal_out2" />
-      <output name="state_out" />
+      <output name="signal_out2" maxwires=10 />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Relay Component" identifier="relaycomponent" ID="9" rect="-207,16,16,16" hiddeningame="True" spritecolor="0,0,0,0" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
@@ -121,11 +121,11 @@
         <link w="36" />
       </input>
       <input name="set_state" />
-      <output name="power_out" />
+      <output name="power_out" maxwires=10 />
       <output name="signal_out1">
         <link w="18" />
       </output>
-      <output name="signal_out2" />
+      <output name="signal_out2" maxwires=10 />
       <output name="state_out">
         <link w="37" />
       </output>
@@ -179,7 +179,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="12" rect="-112,127,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AlienPumpAssembly2.xml b/Content/Items/Assemblies/AlienPumpAssembly2.xml
index b3ed9c5b..f4d57ed9 100644
--- a/Content/Items/Assemblies/AlienPumpAssembly2.xml
+++ b/Content/Items/Assemblies/AlienPumpAssembly2.xml
@@ -22,9 +22,9 @@
     </Repairable>
   </Item>
   <Item name="Alien Generator" identifier="aliengenerator_new" ID="5" rect="79,80,153,171" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="alien" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.3">
-    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="3200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="112,146,190,50" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ItemContainer itempos="264,-321" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" contained="0" />
-    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="10" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <PowerContainer indicatorposition="0,0" indicatorsize="0,0" maxoutput="10000" capacity="30" charge="0" maxrechargespeed="1000" rechargespeed="0" minvoltage="0.5" powerconsumption="0" isactive="True" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="shutdown" />
@@ -93,12 +93,12 @@
         <link w="35" />
       </input>
       <input name="set_state" />
-      <output name="power_out" />
+      <output name="power_out" maxwires=10 />
       <output name="signal_out1">
         <link w="30" />
       </output>
-      <output name="signal_out2" />
-      <output name="state_out" />
+      <output name="signal_out2" maxwires=10 />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Relay Component" identifier="relaycomponent" ID="21" rect="-207,16,16,16" hiddeningame="True" spritecolor="0,0,0,0" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
@@ -117,11 +117,11 @@
         <link w="32" />
       </input>
       <input name="set_state" />
-      <output name="power_out" />
+      <output name="power_out" maxwires=10 />
       <output name="signal_out1">
         <link w="29" />
       </output>
-      <output name="signal_out2" />
+      <output name="signal_out2" maxwires=10 />
       <output name="state_out">
         <link w="33" />
       </output>
@@ -175,7 +175,7 @@
     </ConnectionPanel>
   </Item>
   <Item name="Alien Light Component" identifier="alienlightcomponent" ID="24" rect="-112,127,16,16" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="1">
-    <LightComponent range="15" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
+    <LightComponent range="60" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="0,255,255,255" isactive="True" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="" />
     <ConnectionPanel locked="True" pickingtime="0" canbepicked="False" allowingameediting="False" msg="itemmsgrewirescrewdriver">
       <requireditem identifiers="screwdriver" type="Equipped" optional="false" ignoreineditor="false" />
       <input name="toggle" />
diff --git a/Content/Items/Assemblies/AutoAirlockDoors.xml b/Content/Items/Assemblies/AutoAirlockDoors.xml
index 423726ad..2c096a00 100644
--- a/Content/Items/Assemblies/AutoAirlockDoors.xml
+++ b/Content/Items/Assemblies/AutoAirlockDoors.xml
@@ -17,7 +17,7 @@
       <output name="state_out">
         <link w="29" i="0" />
       </output>
-      <output name="condition_out" />
+      <output name="condition_out" maxwires=10 />
       <output name="activate_out">
         <link w="25" i="0" />
       </output>
@@ -37,8 +37,8 @@
       <input name="set_state">
         <link w="26" i="1" />
       </input>
-      <output name="state_out" />
-      <output name="condition_out" />
+      <output name="state_out" maxwires=10 />
+      <output name="condition_out" maxwires=10 />
       <output name="activate_out">
         <link w="20" i="0" />
       </output>
@@ -54,8 +54,8 @@
       <output name="signal_out">
         <link w="30" i="0" />
       </output>
-      <output name="water_%" />
-      <output name="high_pressure" />
+      <output name="water_%" maxwires=10 />
+      <output name="high_pressure" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="orcomponent" ID="28" rect="16,-112,16,16" NonInteractable="False" NonPlayerTeamInteractable="False" AllowSwapping="True" Rotation="0" Scale="0.5" SpriteColor="255,255,255,255" InventoryIconColor="255,255,255,255" ContainerColor="255,255,255,255" InvulnerableToDamage="False" Tags="logic,smallitem" DisplaySideBySideWhenLinked="False" DisallowedUpgrades="" SpriteDepth="0.8" HiddenInGame="False" conditionpercentage="100">
@@ -146,7 +146,7 @@
       </input>
       <input name="set_speed" />
       <input name="set_targetlevel" />
-      <output name="condition_out" />
+      <output name="condition_out" maxwires=10 />
     </ConnectionPanel>
     <Repairable DeteriorationSpeed="0.2" MinDeteriorationDelay="60" MaxDeteriorationDelay="240" MinDeteriorationCondition="0" RepairThreshold="80" FixDurationLowSkill="25" FixDurationHighSkill="5" PickingTime="0" CanBePicked="False" AllowInGameEditing="True" Msg="ItemMsgRepairWrench">
       <requireditem items="wrench" type="Equipped" characterinventoryslottype="None" optional="false" ignoreineditor="false" excludebroken="true" requireempty="false" excludefullcondition="false" targetslot="-1" allowvariants="true" rotation="0" setactive="false" />
diff --git a/Content/Items/Assemblies/AutoBilgePump.xml b/Content/Items/Assemblies/AutoBilgePump.xml
index dcc09474..8ec7274e 100644
--- a/Content/Items/Assemblies/AutoBilgePump.xml
+++ b/Content/Items/Assemblies/AutoBilgePump.xml
@@ -40,7 +40,7 @@
         <link w="11" />
         <link w="12" />
       </output>
-      <output name="water_%" />
+      <output name="water_%" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="smallpump" ID="10" rect="-64,40,64,48" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="pump" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.8" hiddeningame="False">
diff --git a/Content/Items/Assemblies/AutoDockingHatch.xml b/Content/Items/Assemblies/AutoDockingHatch.xml
index 87c563b9..91f0a57d 100644
--- a/Content/Items/Assemblies/AutoDockingHatch.xml
+++ b/Content/Items/Assemblies/AutoDockingHatch.xml
@@ -12,11 +12,11 @@
         <link w="46" i="1" />
       </input>
       <input name="set_state" />
-      <output name="power" />
+      <output name="power" maxwires=10 />
       <output name="state_out">
         <link w="47" i="0" />
       </output>
-      <output name="proximity_sensor" />
+      <output name="proximity_sensor" maxwires=10 />
       <output name="on_dock">
         <link w="45" i="0" />
       </output>
@@ -41,8 +41,8 @@
       <output name="state_out">
         <link w="49" i="0" />
       </output>
-      <output name="condition_out" />
-      <output name="activate_out" />
+      <output name="condition_out" maxwires=10 />
+      <output name="activate_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="circuitbox" ID="28" markedfordeconstruction="false" rect="32,-6,32,32" NonInteractable="False" NonPlayerTeamInteractable="False" AllowSwapping="True" Rotation="0" Scale="0.5" SpriteColor="255,255,255,255" InventoryIconColor="255,255,255,255" ContainerColor="255,255,255,255" InvulnerableToDamage="False" Tags="smallitem" DisplaySideBySideWhenLinked="False" DisallowedUpgrades="" SpriteDepth="0.8" HiddenInGame="False" conditionpercentage="100">
@@ -73,12 +73,12 @@
       <output name="signal_out2">
         <link w="48" i="0" />
       </output>
-      <output name="signal_out3" />
-      <output name="signal_out4" />
-      <output name="signal_out5" />
-      <output name="signal_out6" />
-      <output name="signal_out7" />
-      <output name="signal_out8" />
+      <output name="signal_out3" maxwires=10 />
+      <output name="signal_out4" maxwires=10 />
+      <output name="signal_out5" maxwires=10 />
+      <output name="signal_out6" maxwires=10 />
+      <output name="signal_out7" maxwires=10 />
+      <output name="signal_out8" maxwires=10 />
     </ConnectionPanel>
     <ItemContainer QuickUseMovesItemsInside="False" ContainableRestrictions="" AutoFill="True" PickingTime="0" CanBePicked="False" LockGuiFramePosition="False" GuiFrameOffset="0,0" AllowInGameEditing="True" Msg="" contained="29,30,31,32,33,34,35,36,37,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,," ExtraStackSize="0" />
     <ItemContainer QuickUseMovesItemsInside="False" ContainableRestrictions="" AutoFill="True" PickingTime="0" CanBePicked="False" LockGuiFramePosition="False" GuiFrameOffset="0,0" AllowInGameEditing="True" Msg="" contained="38;39;40;41;42;43,,,,,,,,," ExtraStackSize="0" />
@@ -209,7 +209,7 @@
       <input name="signal_in">
         <link w="39" i="1" />
       </input>
-      <output name="signal_out" />
+      <output name="signal_out" maxwires=10 />
       <input name="set_delay" />
     </ConnectionPanel>
   </Item>
@@ -299,7 +299,7 @@
         <link w="43" i="1" />
       </input>
       <input name="set_output" />
-      <output name="signal_out" />
+      <output name="signal_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="andcomponent" ID="36" markedfordeconstruction="false" rect="152,-118,16,16" NonInteractable="False" NonPlayerTeamInteractable="False" AllowSwapping="True" Rotation="0" Scale="0.5" SpriteColor="255,255,255,255" InventoryIconColor="255,255,255,255" ContainerColor="255,255,255,255" InvulnerableToDamage="False" Tags="logic,circuitboxcomponent,smallitem" DisplaySideBySideWhenLinked="False" DisallowedUpgrades="" SpriteDepth="0.8" HiddenInGame="False" conditionpercentage="100" hideinassemblypreview="true">
@@ -333,7 +333,7 @@
       </input>
       <input name="signal_in2" />
       <input name="set_output" />
-      <output name="signal_out" />
+      <output name="signal_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="andcomponent" ID="31" markedfordeconstruction="false" rect="152,-118,16,16" NonInteractable="False" NonPlayerTeamInteractable="False" AllowSwapping="True" Rotation="0" Scale="0.5" SpriteColor="255,255,255,255" InventoryIconColor="255,255,255,255" ContainerColor="255,255,255,255" InvulnerableToDamage="False" Tags="logic,circuitboxcomponent,smallitem" DisplaySideBySideWhenLinked="False" DisallowedUpgrades="" SpriteDepth="0.8" HiddenInGame="False" conditionpercentage="100" hideinassemblypreview="true">
@@ -348,7 +348,7 @@
         <link w="38" i="1" />
       </input>
       <input name="set_output" />
-      <output name="signal_out" />
+      <output name="signal_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="andcomponent" ID="30" markedfordeconstruction="false" rect="152,-118,16,16" NonInteractable="False" NonPlayerTeamInteractable="False" AllowSwapping="True" Rotation="0" Scale="0.5" SpriteColor="255,255,255,255" InventoryIconColor="255,255,255,255" ContainerColor="255,255,255,255" InvulnerableToDamage="False" Tags="logic,circuitboxcomponent,smallitem" DisplaySideBySideWhenLinked="False" DisallowedUpgrades="" SpriteDepth="0.8" HiddenInGame="False" conditionpercentage="100" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/AutoDoor.xml b/Content/Items/Assemblies/AutoDoor.xml
index e96d4cb7..c9a17e4f 100644
--- a/Content/Items/Assemblies/AutoDoor.xml
+++ b/Content/Items/Assemblies/AutoDoor.xml
@@ -15,7 +15,7 @@
       <input name="set_state">
         <link w="1306" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Blue Wire" identifier="bluewire" ID="1310" rect="51339,-8888,42,16" hiddeningame="False" noninteractable="False" scale="0.5" spritecolor="51,121,173,255" inventoryiconcolor="51,121,173,255" containercolor="255,255,255,255" condition="100" tags="smallitem,wire" displaysidebysidewhenlinked="False" spritedepth="0.55" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/AutoDoorWindowed.xml b/Content/Items/Assemblies/AutoDoorWindowed.xml
index d0f5c191..6c6203e3 100644
--- a/Content/Items/Assemblies/AutoDoorWindowed.xml
+++ b/Content/Items/Assemblies/AutoDoorWindowed.xml
@@ -15,7 +15,7 @@
       <input name="set_state">
         <link w="1306" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Blue Wire" identifier="bluewire" ID="1310" rect="51323,-8920,42,16" hiddeningame="False" noninteractable="False" scale="0.5" spritecolor="51,121,173,255" inventoryiconcolor="51,121,173,255" containercolor="255,255,255,255" condition="100" tags="smallitem,wire" displaysidebysidewhenlinked="False" spritedepth="0.55" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/AutoHatch.xml b/Content/Items/Assemblies/AutoHatch.xml
index c57a583e..ccc59344 100644
--- a/Content/Items/Assemblies/AutoHatch.xml
+++ b/Content/Items/Assemblies/AutoHatch.xml
@@ -15,7 +15,7 @@
       <input name="set_state">
         <link w="583" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Blue Wire" identifier="bluewire" ID="587" rect="48939,-10664,42,16" hiddeningame="False" noninteractable="False" scale="0.5" spritecolor="51,121,173,255" inventoryiconcolor="51,121,173,255" containercolor="255,255,255,255" condition="100" tags="smallitem,wire" displaysidebysidewhenlinked="False" spritedepth="0.55" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/DivingGearCabinetLarge.xml b/Content/Items/Assemblies/DivingGearCabinetLarge.xml
index 5208f821..64640917 100644
--- a/Content/Items/Assemblies/DivingGearCabinetLarge.xml
+++ b/Content/Items/Assemblies/DivingGearCabinetLarge.xml
@@ -4,24 +4,24 @@
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="ItemMsgInteractSelect" contained="93,95,97,99,101,102,103,104,105,106,107,108,109,110,111,112,113,115,117,119,121,122,123,124,125,127,129,131,133,135" />
   </Item>
   <Item name="" identifier="flashlight" ID="135" rect="50052,-15092,24,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,tool,provocative,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="29.999998,-14.999999" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="136" />
   </Item>
   <Item name="" identifier="flashlight" ID="133" rect="50052,-15092,24,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,tool,provocative,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.02" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="127,127,127,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Holdable holdpos="29.999998,-14.999999" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="134" />
   </Item>
   <Item name="" identifier="sonarbeacon" ID="131" rect="50057,-15080,14,32" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" sonarlabel="Sonar Beacon" condition="100" tags="smallitem,sonar,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="30" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="50" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <CustomInterface labels="sonarbeacon.beaconactive,sonarbeacon.beaconsignal" signals="1;1" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="132" />
   </Item>
   <Item name="" identifier="sonarbeacon" ID="129" rect="50057,-15080,14,32" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" sonarlabel="Sonar Beacon" condition="100" tags="smallitem,sonar,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="30" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="50" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="2" lightcolor="0,255,0,255" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <CustomInterface labels="sonarbeacon.beaconactive,sonarbeacon.beaconsignal" signals="1;1" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="130" />
   </Item>
@@ -37,19 +37,19 @@
   </Item>
   <Item name="" identifier="flare" ID="124" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="flare" ID="123" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="flare" ID="122" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="flare" ID="121" rect="50051,-15092,27,9" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light,provocative" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" flicker="0.5" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
   </Item>
   <Item name="" identifier="oxygentank" ID="106" rect="50058,-15080,12,33" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,oxygensource" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="29.999998,-14.999999" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
@@ -147,32 +147,32 @@
   </Item>
   <Item name="" identifier="underwaterscooter" ID="119" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="120" />
   </Item>
   <Item name="" identifier="underwaterscooter" ID="117" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="118" />
   </Item>
   <Item name="" identifier="underwaterscooter" ID="115" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="116" />
   </Item>
   <Item name="" identifier="underwaterscooter" ID="113" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="114" />
diff --git a/Content/Items/Assemblies/DivingGearCabinetSmall.xml b/Content/Items/Assemblies/DivingGearCabinetSmall.xml
index 4f8e4dc2..82f80eaf 100644
--- a/Content/Items/Assemblies/DivingGearCabinetSmall.xml
+++ b/Content/Items/Assemblies/DivingGearCabinetSmall.xml
@@ -21,23 +21,23 @@
   </Item>
   <Item name="Flare" identifier="flare" ID="53" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="52" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="51" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="50" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Flare" identifier="flare" ID="49" rect="227,-124,27,9" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Throwable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="600" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <LightComponent range="2400" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,0,0,255" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
   </Item>
   <Item name="Handheld Sonar" identifier="handheldsonar" ID="47" rect="229,-123,22,11" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,sonar" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="30" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
@@ -81,32 +81,32 @@
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="45" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="46" />
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="43" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="44" />
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="35" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="36" />
   </Item>
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="33" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
-    <LightComponent range="1000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
+    <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
+    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="34" />
diff --git a/Content/Items/Assemblies/DivingSuitLocker.xml b/Content/Items/Assemblies/DivingSuitLocker.xml
index 1714f24b..7bff9fcc 100644
--- a/Content/Items/Assemblies/DivingSuitLocker.xml
+++ b/Content/Items/Assemblies/DivingSuitLocker.xml
@@ -19,8 +19,8 @@
     <Holdable holdpos="30,-15" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
   </Item>
   <Item name="Diving Suit" identifier="divingsuit" ID="14" rect="-15,-116,63,56" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="diving,divingsuit,light" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
-    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <LightComponent range="200" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
+    <LightComponent range="800" castshadows="True" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="250,224,165,255" isactive="True" minvoltage="0.5" powerconsumption="10" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
     <Wearable pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgEquipSelect" />
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="15" />
   </Item>
diff --git a/Content/Items/Assemblies/Door.xml b/Content/Items/Assemblies/Door.xml
index 3905b752..be2d07b3 100644
--- a/Content/Items/Assemblies/Door.xml
+++ b/Content/Items/Assemblies/Door.xml
@@ -15,7 +15,7 @@
         <link w="10" />
       </input>
       <input name="set_state" />
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="Button" identifier="button" ID="8" rect="-40,15,24,27" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem" displaysidebysidewhenlinked="False" spritedepth="0.8" scale="0.5">
diff --git a/Content/Items/Assemblies/GravitySphereAssembly.xml b/Content/Items/Assemblies/GravitySphereAssembly.xml
index d12ee3d1..335ffe8e 100644
--- a/Content/Items/Assemblies/GravitySphereAssembly.xml
+++ b/Content/Items/Assemblies/GravitySphereAssembly.xml
@@ -10,7 +10,7 @@
       <input name="set_state" >
         <link w="11" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
       <input name="shutdown" >
         <link w="12" />
       </input>
diff --git a/Content/Items/Assemblies/GravitySphereAssembly2Terminals.xml b/Content/Items/Assemblies/GravitySphereAssembly2Terminals.xml
index bf6c4151..7a594722 100644
--- a/Content/Items/Assemblies/GravitySphereAssembly2Terminals.xml
+++ b/Content/Items/Assemblies/GravitySphereAssembly2Terminals.xml
@@ -11,7 +11,7 @@
       <input name="set_state" >
         <link w="18" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
       <input name="shutdown" >
         <link w="12" />
         <link w="17" />
diff --git a/Content/Items/Assemblies/GuardianPodAssembly.xml b/Content/Items/Assemblies/GuardianPodAssembly.xml
index 0134d7c6..ab4e9b25 100644
--- a/Content/Items/Assemblies/GuardianPodAssembly.xml
+++ b/Content/Items/Assemblies/GuardianPodAssembly.xml
@@ -13,7 +13,7 @@
       <input name="shutdown" >
         <link w="12" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
diff --git a/Content/Items/Assemblies/RuinAutoDoor.xml b/Content/Items/Assemblies/RuinAutoDoor.xml
index 84c16cd6..7fb69449 100644
--- a/Content/Items/Assemblies/RuinAutoDoor.xml
+++ b/Content/Items/Assemblies/RuinAutoDoor.xml
@@ -8,7 +8,7 @@
       <input name="set_state">
         <link w="157" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="bluewire" ID="157" rect="49691,-15136,42,16" noninteractable="False" nonplayerteaminteractable="False" allowswapping="True" rotation="0" scale="0.5" spritecolor="51,121,173,255" inventoryiconcolor="51,121,173,255" containercolor="255,255,255,255" condition="100" invulnerabletodamage="False" tags="smallitem,wire" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="True" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/RuinAutoHatch.xml b/Content/Items/Assemblies/RuinAutoHatch.xml
index aa0c6b22..e07c350b 100644
--- a/Content/Items/Assemblies/RuinAutoHatch.xml
+++ b/Content/Items/Assemblies/RuinAutoHatch.xml
@@ -8,7 +8,7 @@
       <input name="set_state">
         <link w="115" />
       </input>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="bluewire" ID="115" rect="51259,-15328,42,16" noninteractable="False" nonplayerteaminteractable="False" allowswapping="True" rotation="0" scale="0.5" spritecolor="51,121,173,255" inventoryiconcolor="51,121,173,255" containercolor="255,255,255,255" condition="100" invulnerabletodamage="False" tags="smallitem,wire" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
diff --git a/Content/Items/Assemblies/ToxinsGeneratorAssembly.xml b/Content/Items/Assemblies/ToxinsGeneratorAssembly.xml
index fb28f10d..ae041856 100644
--- a/Content/Items/Assemblies/ToxinsGeneratorAssembly.xml
+++ b/Content/Items/Assemblies/ToxinsGeneratorAssembly.xml
@@ -129,7 +129,7 @@
       </input>
       <input name="toggle" />
       <input name="set_state" />
-      <output name="power_out" />
+      <output name="power_out" maxwires=10 />
       <output name="signal_out1">
         <link w="13" />
         <link w="14" />
@@ -142,7 +142,7 @@
         <link w="19" />
         <link w="20" />
       </output>
-      <output name="state_out" />
+      <output name="state_out" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
diff --git a/Content/Items/Assemblies/WiredSurveillanceSystem.xml b/Content/Items/Assemblies/WiredSurveillanceSystem.xml
index 6b8b8359..50eca459 100644
--- a/Content/Items/Assemblies/WiredSurveillanceSystem.xml
+++ b/Content/Items/Assemblies/WiredSurveillanceSystem.xml
@@ -59,12 +59,12 @@
       <output name="signal_out3">
         <link w="1051" i="0" />
       </output>
-      <output name="signal_out4" />
-      <output name="signal_out5" />
-      <output name="signal_out6" />
-      <output name="signal_out7" />
-      <output name="signal_out8" />
-      <output name="signal_out9" />
+      <output name="signal_out4" maxwires=10 />
+      <output name="signal_out5" maxwires=10 />
+      <output name="signal_out6" maxwires=10 />
+      <output name="signal_out7" maxwires=10 />
+      <output name="signal_out8" maxwires=10 />
+      <output name="signal_out9" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="bluewire" ID="1054" markedfordeconstruction="false" rect="-51845,-18024,42,16" NonInteractable="False" NonPlayerTeamInteractable="False" AllowSwapping="True" Rotation="0" Scale="0.5" SpriteColor="51,121,173,255" InventoryIconColor="51,121,173,255" ContainerColor="255,255,255,255" InvulnerableToDamage="False" Tags="smallitem,wire" DisplaySideBySideWhenLinked="False" DisallowedUpgrades="" SpriteDepth="0.8" HiddenInGame="False" conditionpercentage="100" hideinassemblypreview="true">
@@ -99,11 +99,11 @@
     <ConnectionPanel Locked="False" PickingTime="0" CanBePicked="False" LockGuiFramePosition="False" GuiFrameOffset="0,0" AllowInGameEditing="True" Msg="ItemMsgRewireScrewdriver">
       <requireditem items="screwdriver" type="Equipped" characterinventoryslottype="None" optional="false" ignoreineditor="false" excludebroken="true" requireempty="false" excludefullcondition="false" targetslot="-1" allowvariants="true" rotation="0" setactive="false" />
       <input name="power_in" />
-      <output name="condition_out" />
+      <output name="condition_out" maxwires=10 />
       <output name="position_out">
         <link w="1052" i="0" />
       </output>
-      <output name="trigger_out" />
+      <output name="trigger_out" maxwires=10 />
       <output name="prev_camera">
         <link w="1053" i="1" />
       </output>
diff --git a/Content/Items/Button/button.xml b/Content/Items/Button/button.xml
index 96d3e523..211c7adc 100644
--- a/Content/Items/Button/button.xml
+++ b/Content/Items/Button/button.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="button" category="Electrical" tags="smallitem,button" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="button" category="Electrical" tags="smallitem,button" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="60">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="engcab"/>
-    <Price baseprice="125" minavailable="4">
+    <Price baseprice="125" minavailable="12">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" />
@@ -29,22 +29,22 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="10.0" aimpos="35,-10" handle1="0,0" attachable="true" attachedbydefault="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
   </Item>
-  <Item name="" identifier="switch" category="Electrical" tags="smallitem,switch" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="8">
+  <Item name="" identifier="switch" category="Electrical" tags="smallitem,switch" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" maxstacksize="60">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="engcab"/>
-    <Price baseprice="125" minavailable="4">
+    <Price baseprice="125" minavailable="12">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="10"/>
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="30"/>
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="448,192,64,64" origin="0.5,0.5" />
     <Sprite texture="button.png" sourcerect="4,49,22,40" depth="0.79" origin="0.5,0.5" />
@@ -61,18 +61,18 @@
       <sound file="Content/Items/Button/Switch1.ogg" type="OnUse" range="250.0" />
       <sound file="Content/Items/Button/Switch2.ogg" type="OnUse" range="250.0" />
     </Controller>
-      <LightComponent range="10.0" lightcolor="50,255,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="50,255,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
         <sprite texture="Content/Items/Button/button.png" sourcerect="4,9,22,40" depth="0.1" origin="0.5,0.5" alpha="1.0" />
         <IsActive targetitemcomponent="Controller" State="eq True" />
       </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,50,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,50,50,0" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Button/button.png" sourcerect="4,89,22,40" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="Controller" State="eq False" />
     </LightComponent>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="10.0" aimpos="35,-10" handle1="0,0" attachable="true" attachedbydefault="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
@@ -80,13 +80,13 @@
   </Item>
   <Item name="" identifier="lever" category="Electrical" tags="smallitem,switch" allowedlinks="door" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <PreferredContainer primary="engcab"/>
-    <Price baseprice="125" minavailable="4">
+    <Price baseprice="125" minavailable="12">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="10"/>
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="30"/>
     </Price>
     <Sprite texture="button.png" sourcerect="64,1,63,62" depth="0.79" origin="0.5,0.5" />
     <Deconstruct time="10">
@@ -109,7 +109,7 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="10.0" aimpos="35,-10" handle1="0,0" attachable="true" attachedbydefault="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
diff --git a/Content/Items/Command/command.xml b/Content/Items/Command/command.xml
index 04a3de35..158c6d84 100644
--- a/Content/Items/Command/command.xml
+++ b/Content/Items/Command/command.xml
@@ -14,11 +14,11 @@
       <MaintainPosIndicator texture="Content/Items/Command/NavUI.png" sourcerect="50,0,60,61" />
       <MaintainPosOriginIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,0,50,54" />
       <SteeringIndicator texture="Content/Items/Command/NavUI.png" sourcerect="0,135,362,16" origin="0,0.5"/>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,304" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
         <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,304" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
@@ -71,17 +71,17 @@
       <input name="power_in" displayname="connection.powerin" />
       <input name="transducer_in" displayname="connection.sonartransducerin" />
       <input name="velocity_in" displayname="connection.steeringvelocityin" />
-      <output name="velocity_x_out" displayname="connection.velocityxout" />
-      <output name="velocity_y_out" displayname="connection.velocityyout" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
-      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" />
-      <output name="signal_out3" displayname="connection.signaloutx~[num]=3" />
-      <output name="toggle_docking" displayname="connection.toggledocking" />
-      <output name="current_velocity_x" displayname="connection.currentvelocityx" />
-      <output name="current_velocity_y" displayname="connection.currentvelocityy" />
-      <output name="current_position_x" displayname="connection.currentpositionx" />
-      <output name="current_position_y" displayname="connection.currentpositiony" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="velocity_x_out" displayname="connection.velocityxout" maxwires=10 />
+      <output name="velocity_y_out" displayname="connection.velocityyout" maxwires=10 />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
+      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" maxwires=10 />
+      <output name="signal_out3" displayname="connection.signaloutx~[num]=3" maxwires=10 />
+      <output name="toggle_docking" displayname="connection.toggledocking" maxwires=10 />
+      <output name="current_velocity_x" displayname="connection.currentvelocityx" maxwires=10 />
+      <output name="current_velocity_y" displayname="connection.currentvelocityy" maxwires=10 />
+      <output name="current_position_x" displayname="connection.currentpositionx" maxwires=10 />
+      <output name="current_position_y" displayname="connection.currentpositiony" maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="180" maxdeteriorationdelay="720" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -105,7 +105,7 @@
     <Sprite texture="Content/Items/Command/CommandDevices.png" depth="0.8" sourcerect="400,0,288,240" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,256,288,240" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="400,512,288,240" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="256,320,288,240" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -163,15 +163,15 @@
       <input name="power_in" displayname="connection.powerin" />
       <input name="transducer_in" displayname="connection.sonartransducerin" />
       <input name="velocity_in" displayname="connection.steeringvelocityin" />
-      <output name="velocity_x_out" displayname="connection.velocityxout" />
-      <output name="velocity_y_out" displayname="connection.velocityyout" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
-      <output name="toggle_docking" displayname="connection.toggledocking" />
-      <output name="current_velocity_x" displayname="connection.currentvelocityx" />
-      <output name="current_velocity_y" displayname="connection.currentvelocityy" />
-      <output name="current_position_x" displayname="connection.currentpositionx" />
-      <output name="current_position_y" displayname="connection.currentpositiony" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="velocity_x_out" displayname="connection.velocityxout" maxwires=10 />
+      <output name="velocity_y_out" displayname="connection.velocityyout" maxwires=10 />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
+      <output name="toggle_docking" displayname="connection.toggledocking" maxwires=10 />
+      <output name="current_velocity_x" displayname="connection.currentvelocityx" maxwires=10 />
+      <output name="current_velocity_y" displayname="connection.currentvelocityy" maxwires=10 />
+      <output name="current_position_x" displayname="connection.currentpositionx" maxwires=10 />
+      <output name="current_position_y" displayname="connection.currentpositiony" maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" fixDurationHighSkill="10" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -224,10 +224,10 @@
       <icon identifier="location" texture="Content/UI/MainIconsAtlas.png" sourcerect="349,435,11,11" origin="0.5,0.5"/>
       <icon identifier="mineral" texture="Content/UI/MainIconsAtlas.png" sourcerect="336,434,7,12" origin="0.5,0.5"/>
       <icon identifier="" texture="Content/UI/MainIconsAtlas.png" sourcerect="346,416,4,4" origin="0.5,0.5"/>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,0,384,212" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
-      <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+      <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
         <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="400,0,384,212" origin="0.5,0.5" alpha="1.0" />
       </LightComponent>
     </Sonar>
@@ -245,7 +245,7 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
       <input name="transducer_in" displayname="connection.sonartransducerin" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -271,7 +271,7 @@
     <Sprite texture="Content/Items/Command/CommandDevices.png" sourcerect="700,0,160,128" depth="0.8" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="700,124,160,128" depth="0.8" maxcondition="80" fadein="true" origin="0.5,0.5" />
     <BrokenSprite texture="Content/Items/Command/CommandDevices.png" sourcerect="856,0,160,128" depth="0.8" maxcondition="0" origin="0.5,0.5" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,320,160,128" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -295,7 +295,7 @@
       <input name="power_in" displayname="connection.powerin" />
       <input name="water_data_in" displayname="connection.waterdatain" />
       <input name="oxygen_data_in" displayname="connection.oxygendatain" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.15" mindeteriorationdelay="120" maxdeteriorationdelay="480" MinDeteriorationCondition="0" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -322,7 +322,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <requireditem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
-      <output name="data_out" displayname="connection.sonardataout" fallbackdisplayname="connection.signalout"/>
+      <output name="data_out" displayname="connection.sonardataout" fallbackdisplayname="connection.signalout"maxwires=10 />
     </ConnectionPanel>
     <aitarget soundrange="8000" fadeouttime="5" />
   </Item>
@@ -341,11 +341,11 @@
       </StatusEffect>
       <requireditem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim" />
-      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" />
-      <output name="prev_camera" displayname="connection.prevcamera" signal="-1" />
-      <output name="next_camera" displayname="connection.nextcamera" signal="1" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim" maxwires=10 />
+      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" maxwires=10 />
+      <output name="prev_camera" displayname="connection.prevcamera" signal="-1" maxwires=10 />
+      <output name="next_camera" displayname="connection.nextcamera" signal="1" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="180" maxdeteriorationdelay="720" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -368,7 +368,7 @@
       <Button text="label.previouscamera" connection="prev_camera" signal="-1" />
       <Button text="label.nextcamera" connection="next_camera" signal="1" />
     </CustomInterface>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
       <sprite texture="Content/Items/Command/CommandDevices.png" depth="0.025" sourcerect="707,763,279,160" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Content/Items/Containers/containers.xml b/Content/Items/Containers/containers.xml
index d94001f2..0871a580 100644
--- a/Content/Items/Containers/containers.xml
+++ b/Content/Items/Containers/containers.xml
@@ -2,9 +2,9 @@
 <Items>
   <Item name="" identifier="suppliescabinet" tags="container,suppliescontainer" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="889,349,120,132" origin="0.5,0.5" />
-    <ItemContainer capacity="6" slotsperrow="3" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="18" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.22" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
     <Upgrade gameversion="1.1.0.0" campaignsaveonly="true">
@@ -16,12 +16,12 @@
   </Item>
   <Item name="" identifier="mediumsteelcabinet" tags="locker,container" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="1,1,175,374" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="9" maxstacksize="60">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
@@ -34,12 +34,12 @@
   </Item>
   <Item name="" aliases="Diving Gear Cabinet" identifier="mediumwindowedsteelcabinet" category="Diving" tags="locker,container" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="178,1,168,377" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="9" maxstacksize="60">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
@@ -52,12 +52,12 @@
   </Item>
   <Item name="" identifier="steelcabinet" tags="locker,container" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="348,2,364,373" origin="0.5,0.5" />
-    <ItemContainer capacity="35" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.28,0.48" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="5" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="15" maxstacksize="60">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
@@ -71,13 +71,13 @@
   <!-- TODO: switch to SecureSteelLockRed.png when access denied and SecureSteelLockGreen.png when access granted-->
   <Item name="" identifier="securesteelcabinet" tags="locker,container,securecontainer" linkable="true" spritecolor="255,255,255,255" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="1,380,105,160" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <SubContainer capacity="9" maxstacksize="60">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <!-- backwards compatibility for older versions in which mobile containers like storage containers were containable in any cabinet -->
@@ -90,7 +90,7 @@
   </Item>
   <Item name="" identifier="railgunshellrack" tags="container,railgunammocontainer" pickdistance="120" scale="0.5" canflipx="false" canflipy="false">
     <Sprite texture="containers.png" depth="0.84" sourcerect="330,811,218,212" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="32,-100" iteminterval="30,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="18" slotsperrow="5" itempos="32,-100" iteminterval="30,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
       <Upgrade gameversion="0.18.0.0" itempos="32,-100" iteminterval="30,0" />
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
       <Containable items="railgunammo" />
@@ -99,26 +99,26 @@
   </Item>
   <Item name="" identifier="railgunshellrack3" nameidentifier="railgunshellrack" category="Legacy" tags="container,railgunammocontainer" pickdistance="120" scale="0.5" canflipx="false" canflipy="false">
     <Sprite texture="containers.png" depth="0.84" sourcerect="330,811,218,212" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" slotsperrow="3" itempos="53,-100" iteminterval="55,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="9" slotsperrow="3" itempos="53,-100" iteminterval="55,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
       <Containable items="railgunammo" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="coilgunammoshelf" tags="container,ammoboxcontainer" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="188,717,140,306" canflipx="false" origin="0.5,0.5" />
-    <ItemContainer capacity="3" canbeselected="true" hideitems="false" itempos="70,-52" iteminterval="0,-96" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="9" canbeselected="true" hideitems="false" itempos="70,-52" iteminterval="0,-96" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
-      <Containable items="ammobox,coilgunammo,depthchargeammo"  excludedidentifiers="boardingpod" />
+      <Containable items="ammobox,coilgunammo,depthchargeammo,deepdiving,smallitem,mediumitem,largeitem"  excludedidentifiers="boardingpod" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="medcabinet" tags="container,medcontainer" category="Medical" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="815,1,208,346" />
-    <ItemContainer capacity="35" slotsperrow="7" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.28,0.48" anchor="Center" style="ItemUI" />
-      <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="5" maxstacksize="1">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" excludedidentifiers="mobilecontainer" />
+      <SubContainer capacity="15" maxstacksize="60">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
@@ -132,13 +132,13 @@
   </Item>
   <Item name="" identifier="toxcabinet" tags="container,toxcontainer" linkable="true" pickdistance="150" waterproof="true" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="889,483,125,148" origin="0.5,0.5" />
-    <ItemContainer capacity="20" slotsperrow="5" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
       <Containable items="smallitem,mediumitem" excludedidentifiers="mobilecontainer" />
-      <SubContainer capacity="3" maxstacksize="1">
+      <SubContainer capacity="9" maxstacksize="60">
         <SlotIcon texture="Content/UI/CommandUIAtlas.png" sourcerect="639,926,128,80" origin="0.5,0.5" />
-        <Containable items="mobilecontainer" />
+        <Containable items="mobilecontainer,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
@@ -160,10 +160,10 @@
     <!-- TODO: implement
     <DecorativeSprite name="Diving Suit Locker Light" texture="DivingSuitLocker.png" depth="0.84" sourcerect="330,77,241,67" origin="0.5,0.5" />
     -->
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="5" itempos="132,-44" iteminterval="0,-65" itemrotation="0" containedspritedepth="0.83" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="15" slotsperrow="4" itempos="132,-44" iteminterval="0,-65" itemrotation="0" containedspritedepth="0.83" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/Map/LabelIcons.png" sourcerect="512,0,256,256" origin="0.5,0.5" />
-      <Containable items="deepdiving" excludeditems="deepdivinglarge" />
+      <Containable items="deepdiving" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="oxygentankshelf" category="Legacy" tags="container,oxygentankcontainer,oxygentankrefiller" pickdistance="50" scale="0.6">
@@ -188,7 +188,7 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="10" maxstacksize="1" slotsperrow="5" itempos="24,-41" iteminterval="42,-65" itemsperrow="2" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="30" maxstacksize="60" slotsperrow="6" itempos="24,-41" iteminterval="42,-65" itemsperrow="2" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnFire" target="This" tags="onfire" duration="1" stackable="false" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -235,7 +235,7 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="0,0" iteminterval="0,0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/Map/LabelIcons.png" sourcerect="512,0,256,256" origin="0.5,0.5" />
-      <Containable items="deepdiving" excludeditems="deepdivinglarge" />
+      <Containable items="deepdiving" />
     </ItemContainer>
   </Item>
   
@@ -261,7 +261,7 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel> 
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="9" maxstacksize="60" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.18" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -282,13 +282,13 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="407,376,152,89" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="20" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+    <ItemContainer capacity="50" maxstacksize="60" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   <Item name="" identifier="securemetalcrate" tags="crate,securecrate" scale="0.5" linkable="true" pickdistance="150" impactsoundtag="impact_metal_heavy">
@@ -297,14 +297,14 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="561,377,151,86" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="20" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+    <ItemContainer capacity="50" maxstacksize="60" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
       <RequiredItem items="idcard" type="Picked" msg="ItemMsgUnauthorizedAccess" ignoreineditor="true" />
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+      <Containable items="smallitem,mediumitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   <Item name="" identifier="explosivecrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -313,13 +313,13 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="410,466,150,88" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="36" maxstacksize="60" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   <Item name="" identifier="chemicalcrate" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -328,13 +328,13 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="562,467,148,87" origin="0.5,0.5" />
     <Body width="145" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="36" maxstacksize="60" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   <Item name="" identifier="mediccrate" category="Medical" tags="crate,allowcleanup" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" waterproof="true">
@@ -342,32 +342,32 @@
     <Sprite texture="containers.png" depth="0.54" sourcerect="410,563,148,87" origin="0.5,0.5" />
     <Body width="145" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="36" maxstacksize="60" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   <Item name="" identifier="extinguisherbracket" category="Equipment" tags="extinguisherholder" canflipx="false" canflipy="false" scale="0.5" pickdistance="75">
     <Sprite texture="containers.png" depth="0.84" sourcerect="815,349,72,204" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="1" slotsperrow="1" itempos="35,-130" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="60" slotsperrow="1" itempos="35,-130" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="extinguisher" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="*0.5" itempos="35,-130" />
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   <Item name="" identifier="weaponholder" category="Weapon" tags="weaponholder" canflipx="false" canflipy="false" scale="0.5">
     <Sprite texture="containers.png" depth="0.85" sourcerect="188,596,84,85" origin="0.5,0.5"/>
     <DecorativeSprite texture="containers.png" depth="0.83" sourcerect="188,682,124,33" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="1" slotsperrow="1" itempos="46,-47" iteminterval="0,0" itemrotation="90" containedspritedepth="0.831" canbeselected="true" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" AutoInteractWithContained="true" maxstacksize="60" slotsperrow="1" itempos="46,-47" iteminterval="0,0" itemrotation="90" containedspritedepth="0.831" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="mountableweapon" />
     </ItemContainer>
@@ -410,7 +410,7 @@
 
   <Item name="" identifier="crateshelf" tags="container,cargocontainer" linkable="true" canflipx="false" pickdistance="150" scale="0.5">
     <Sprite texture="containers.png" depth="0.84" sourcerect="1,657,185,366" origin="0.5,0.5" />
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="12" maxstacksize="60" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable items="crate" />
     </ItemContainer>
@@ -428,8 +428,8 @@
     </Fabricate>
     <Price baseprice="300" sold="false" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" multiplier="0.7" />
-      <Price storeidentifier="merchantcity" sold="true" minavailable="1" />
-      <Price storeidentifier="merchantresearch" sold="true" minavailable="1" />
+      <Price storeidentifier="merchantcity" sold="true" minavailable="3" />
+      <Price storeidentifier="merchantresearch" sold="true" minavailable="3" />
       <Price storeidentifier="merchantmilitary" multiplier="0.8" />
       <Price storeidentifier="merchantmine" multiplier="0.8" />
     </Price>
@@ -442,12 +442,12 @@
       <AnimationConditional Voltage="gt 0.1" targetitemcomponent="LightComponent"/>
     </DecorativeSprite>
     <Body width="124" height="95" density="20" />
-    <LightComponent range="100" lightcolor="142,145,184,120" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false" />
+    <LightComponent range="400" lightcolor="142,145,184,120" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false" />
     <Holdable slots="Any,RightHand,LeftHand" holdpos="0,-70" handle1="0,45" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" allowswappingwhenpicked="false" />
     <ItemContainer capacity="1" hideitems="true" ContainedStateIndicatorSlot="1">
       <Containable items="alienartifact"/>
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1"  maxstacksize="1">
+      <SubContainer capacity="1"  maxstacksize="60">
         <Containable items="mobilebattery">
           <StatusEffect type="OnContaining" target="Contained" Condition="-0.15" >
             <RequiredItem items="alienartifact" type="Contained"/>
@@ -460,7 +460,7 @@
 
 
   <Item name="" identifier="sealedsupplycrate" tags="crate" scale="0.5" linkable="true" pickdistance="150" showcontentsintooltip="true" impactsoundtag="impact_metal_heavy" hideinmenus="true">
-    <PreferredContainer secondary="wreckstoragecab" spawnprobability="0.02"/>
+    <PreferredContainer secondary="wreckstoragecab" spawnprobability="0.04"/>
     <Price baseprice="1250" sold="false" canbespecial="false" />
     <!--<InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,128,64,64" />-->
     <Sprite texture="containers.png" depth="0.54" sourcerect="562,563,147,86" origin="0.5,0.5" />
@@ -470,7 +470,7 @@
   <Item name="" identifier="unitloaddevice" tags="cargocontainer" linkable="true" pickdistance="150" scale="0.5" waterproof="true" >
     <Sprite texture="UnitLoadDevice.png" depth="0.8" sourcerect="0,0,567,446" origin="0.5,0.5" />
     <DecorativeSprite texture="UnitLoadDevice.png" depth="0.85" sourcerect="0,457,567,446" origin="0.5,0.5" />
-    <ItemContainer capacity="12" maxstacksize="1" canbeselected="true" hideitems="false" itempos="120,-364" iteminterval="150,80" itemsperrow="3" slotsperrow="4" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
+    <ItemContainer capacity="36" maxstacksize="60" canbeselected="true" hideitems="false" itempos="120,-364" iteminterval="150,80" itemsperrow="3" slotsperrow="6" msg="ItemMsgInteractSelect" containedspritedepths="0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82,0.81,0.82">
       <GuiFrame relativesize="0.25,0.3" anchor="Center" style="ItemUI" />
       <Containable items="crate" />
     </ItemContainer>
@@ -483,12 +483,12 @@
     <Body width="150" height="80" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
     <DecorativeSprite texture="Content/Items/Electricity/signalcomp.png" depth="0.53" sourcerect="195,33,27,31" origin="0.5,1.0"/>    
-    <LightComponent range="60.0" lightcolor="100,225,100,50" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
+    <LightComponent range="240" lightcolor="100,225,100,50" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.9" pulsefrequency="0.5">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" depth="0.53" sourcerect="195,33,27,31" origin="0.5,1.0" alpha="1.0" />
     </LightComponent>    
     <ItemContainer capacity="0" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true" containedstateindicatorstyle="battery" containedstateindicatorslot="0" containedspritedepth="0.56">
       <SlotIcon slotindex="0" texture="Content/UI/ContainerIndicators.png" sourcerect="1,185,120,29" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1" >
+      <SubContainer capacity="1" maxstacksize="60" >
         <Containable items="mobilebattery">
           <StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true" />
           <StatusEffect type="OnContaining" target="Contained" Condition="-0.34" />
@@ -506,8 +506,8 @@
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="11">
-        <Containable items="smallitem">
+      <SubContainer capacity="33">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem">
           <StatusEffect type="OnContaining" target="This,Contained" />
         </Containable>
       </SubContainer>
diff --git a/Content/Items/CreatureLoot/creatureloot.xml b/Content/Items/CreatureLoot/creatureloot.xml
index 847ccc2a..1a395647 100644
--- a/Content/Items/CreatureLoot/creatureloot.xml
+++ b/Content/Items/CreatureLoot/creatureloot.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="alienblood" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" RequireAimToUse="True">
+  <Item name="" identifier="alienblood" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="storageorgan" minamount="1" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="storageorgan" minamount="2" maxamount="4" spawnprobability="1"/>
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="0.85" />
       <Price storeidentifier="merchantcity" multiplier="0.85" />
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="2"/>
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="6"/>
       <Price storeidentifier="merchantmilitary" multiplier="0.9" />
       <Price storeidentifier="merchantmine" multiplier="0.85" />
     </Price>
@@ -39,14 +39,14 @@
     </Holdable>
     <SkillRequirementHint identifier="medical" level="35"/>
   </Item>
-  <Item name="" identifier="huskeggsbasic" category="Material" maxstacksize="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" RequireAimToUse="True">
-    <PreferredContainer primary="toxcontainer" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.2" />
+  <Item name="" identifier="huskeggsbasic" category="Material" maxstacksize="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" RequireAimToUse="True">
+    <PreferredContainer primary="toxcontainer" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.4" />
     <PreferredContainer secondary="medfabcab"/>
     <Price baseprice="310">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantcity" multiplier="1.3" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.3" />
     </Price>
@@ -73,18 +73,18 @@
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" sourcerect="523,86,160,50" depth="0.6" origin="0.5,0.5" />
     <Body width="140" height="45" density="10.5" />
   </Item>
-  <Item name="" identifier="huskeggs" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" RequireAimToUse="True" HitOnlyCharacters="true">
+  <Item name="" identifier="huskeggs" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" RequireAimToUse="True" HitOnlyCharacters="true">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="toxcontainer" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.2" />
+    <PreferredContainer primary="toxcontainer" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0.4" />
     <PreferredContainer secondary="medfabcab"/>
     <Price baseprice="400">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantcity" multiplier="1.3" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchanthusk" minavailable="2" maxavailable="6">
+      <Price storeidentifier="merchanthusk" minavailable="6" maxavailable="6">
         <Reputation faction="huskcult" min="30"/>
       </Price>
     </Price>
@@ -121,12 +121,12 @@
     </MeleeWeapon>
     <Projectile characterusable="false" launchimpulse="20.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" />
   </Item>
-  <Item name="" identifier="swimbladder" description="" Tags="smallitem,chem,medical" cargocontaineridentifier="chemicalcrate" maxstacksize="8" category="Material" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="swimbladder" description="" Tags="smallitem,chem,medical" cargocontaineridentifier="chemicalcrate" maxstacksize="60" category="Material" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="250">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="9" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
@@ -142,17 +142,17 @@
     <Body width="40" height="45" density="9.9" />
     <Holdable slots="RightHand,LeftHand,Any" holdpos="0,-70" handle1="0,10" handle2="0,-10" />
   </Item>
-  <Item name="" identifier="adrenalinegland" Tags="smallitem,chem,medical" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" category="Material" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="adrenalinegland" Tags="smallitem,chem,medical" maxstacksize="60" cargocontaineridentifier="chemicalcrate" description="" category="Material" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="240">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="1.1" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="1.1" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="1.2" minavailable="9" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="0.9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.85" />
     </Price>
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer primary="storageorgan" minamount="1" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer primary="storageorgan" minamount="2" maxamount="4" spawnprobability="1"/>
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.7" sourcerect="108,1,45,51" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="adrenaline" />
@@ -185,7 +185,7 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="1" sold="false" canbespecial="false" />
     <Price baseprice="500" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="70"/>
       </Price>
     </Price>
@@ -257,12 +257,12 @@
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="0.85" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.5" minavailable="1"/>
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.5" minavailable="3"/>
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
       <Price storeidentifier="merchantmine" multiplier="0.85" />
     </Price>
-    <PreferredContainer primary="toxcontainer" spawnprobability="0.01" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="locker" spawnprobability="0.01" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="toxcontainer" spawnprobability="0.02" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="locker" spawnprobability="0.02" notcampaign="true" notpvp="true"/>
     <Sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.18" sourcerect="164,3,42,49" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="alienblood" />
@@ -280,7 +280,7 @@
 	    </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" showcontainedstateindicator="false">
       <Containable items="antibloodloss1">
         <!-- increase scale -->
         <StatusEffect type="OnContaining" target="This" Scale="0.005"/>
@@ -295,10 +295,10 @@
         </StatusEffect>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="164,3,42,49" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="20" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="80" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="164,3,42,49" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -325,7 +325,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="whitegoosplash" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1.0" emitinterval="0" particlespersecond="0" highqualitycollisiondetection="False" copyentityangle="False" />
@@ -350,10 +350,10 @@
         </StatusEffect>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="235,156,67,82" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="30" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="120" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="235,156,67,82" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -380,7 +380,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="mudrapeggbrownchunks" particleamount="100" velocitymin="100" velocitymax="2000" anglemin="0" anglemax="360" scalemin="0.4" scalemax="0.6" />
@@ -403,10 +403,10 @@
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="127,196,196,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -420,7 +420,7 @@
     </Deconstruct>
     <!-- rectangular body to prevent the egg from rolling -->
     <Body width="110" height="120" friction="1.0" restitution="0.01" angulardamping="1.0" density="12"/>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="mudrapeggbrownchunks" particleamount="100" velocitymin="100" velocitymax="2000" anglemin="0" anglemax="360" scalemin="0.4" scalemax="0.6" />
@@ -444,10 +444,10 @@
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="217,157,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="217,157,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -461,7 +461,7 @@
     </Deconstruct>
     <!-- rectangular body to prevent the egg from rolling -->
     <Body width="110" height="120" friction="1.0" restitution="0.01" angulardamping="1.0" density="12"/>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="whitegoosplash" particleamount="20" velocitymin="0" velocitymax="300" anglemin="0" anglemax="360" scalemin="0.5" scalemax="1.0" emitinterval="0" particlespersecond="0" highqualitycollisiondetection="False" copyentityangle="False" />
@@ -485,10 +485,10 @@
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="255,0,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30" >
+    <LightComponent range="20" lightcolor="255,0,0,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30" >
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,199,0,58" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -510,11 +510,11 @@
     <Holdable slots="Any,RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
   </Item>
 
-  <Item name="" identifier="aliencircuitry" category="Misc" Tags="smallitem,signal" maxstacksize="4" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aliencircuitry" category="Misc" Tags="smallitem,signal" maxstacksize="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" spawnprobability="0" />
     <PreferredContainer secondary="mineralcab" spawnprobability="0" />
-    <PreferredContainer secondary="circuitrycontainer" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="3" maxamount="4" spawnprobability="0.3" />
+    <PreferredContainer secondary="circuitrycontainer" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="6" maxamount="8" spawnprobability="0.6" />
     <Price baseprice="80" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity"/>
@@ -639,7 +639,7 @@
         </StatusEffect>
       </Attack>
     </MeleeWeapon>
-    <LightComponent range="200" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
+    <LightComponent range="800" castshadows="False" drawbehindsubs="False" ison="True" blinkfrequency="0" lightcolor="200,200,255,20" isactive="True" minvoltage="0" powerconsumption="0" vulnerabletoemp="False" pickingtime="0" canbepicked="False" allowingameediting="False" msg="">
       <Sprite texture="Content/Characters/Spineling/Spineling.png" sourcerect="0,230,180,23" origin="0.5,0.6" alpha="0.5"/>
     </LightComponent>
   </Item>
diff --git a/Content/Items/Diving/divinggear.xml b/Content/Items/Diving/divinggear.xml
index 5c7a92f2..45338232 100644
--- a/Content/Items/Diving/divinggear.xml
+++ b/Content/Items/Diving/divinggear.xml
@@ -2,17 +2,17 @@
 <Items>
   <Item name="" identifier="divingmask" scale="0.5" category="Diving,Equipment" Tags="smallitem,diving,lightdiving" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <Price baseprice="100">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="7" />
-      <Price storeidentifier="merchantresearch" minavailable="5" />
-      <Price storeidentifier="merchantmilitary" minavailable="6" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="21" />
+      <Price storeidentifier="merchantresearch" minavailable="15" />
+      <Price storeidentifier="merchantmilitary" minavailable="18" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="45" />
     </Price>
-    <PreferredContainer secondary="respawncontainer" amount="2" notcampaign="true"/>
-    <PreferredContainer primary="divingcab" amount="2" allowtransfershere="false"/>
-    <PreferredContainer primary="supplycab" amount="1" transferonlyonepercontainer="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer secondary="outpostsupplycab" amount="1" spawnprobability="0.5"/>
+    <PreferredContainer secondary="respawncontainer" amount="4" notcampaign="true"/>
+    <PreferredContainer primary="divingcab" amount="4" allowtransfershere="false"/>
+    <PreferredContainer primary="supplycab" amount="2" transferonlyonepercontainer="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer secondary="outpostsupplycab" amount="2" spawnprobability="1"/>
     <Deconstruct time="10">
       <Item identifier="plastic" />
       <Item identifier="rubber" />
@@ -30,9 +30,9 @@
       <sprite name="Diving Mask Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.7" hidelimb="false" hideotherwearables="false" sourcerect="226,326,69,68" origin="0.4,0.3" hidewearablesoftype="moustache,beard" />
       <StatusEffect type="OnWearing" target="Character" HideFace="true" setvalue="true" disabledeltatime="true" />
     </Wearable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" UseHullOxygen="false" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -78,16 +78,16 @@
   
   <Item name="" identifier="divingsuit" category="Diving,Equipment" tags="diving,deepdiving,human" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="1" cargocontaineridentifier="">
     <Price baseprice="250">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="4" />
-      <Price storeidentifier="merchantresearch" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="5" />
+      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="12" />
+      <Price storeidentifier="merchantresearch" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="15" />
     </Price>
     <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" campaignonly="true" maxleveldifficulty="35" />
     <PreferredContainer primary="divingsuitcontainer" spawnprobability="1" notcampaign="true" />
     <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="1" maxleveldifficulty="35" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" maxleveldifficulty="35" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.2" maxleveldifficulty="35" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="rubber" />
@@ -109,7 +109,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="5,4,92,94" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <Upgrade gameversion="0.1300.0.3" allowingameediting="false" />
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
@@ -152,9 +152,9 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use">
       <Upgrade gameversion="0.1401.0.0" msg="ItemMsgPickUpUse" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -211,15 +211,15 @@
   <Item name="" identifier="underwaterscooter" category="Diving,Equipment" Tags="smallitem,provocative,scooter" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" requireaimtouse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="180">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="6" />
-      <Price storeidentifier="merchantresearch" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="18" />
+      <Price storeidentifier="merchantresearch" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="12" />
     </Price>
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="divingcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckdivingcab,beaconsupplycab" spawnprobability="0.05"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="divingcab" amount="4" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckdivingcab,beaconsupplycab" spawnprobability="0.1"/>
     <Deconstruct time="20">
       <Item identifier="aluminium" />
       <Item identifier="copper" />
@@ -236,7 +236,7 @@
     <Sprite texture="Scooter.png" depth="0.55" sourcerect="0,0,140,102" />
     <Body width="120" height="60" density="10" />
     <Holdable slots="Any,RightHand+LeftHand" aimpos="90,0" handle1="-35,32" handle2="-27,34" msg="ItemMsgPickUpSelect" holdangle="-10">
-      <LightComponent LightColor="220,255,150,200" range="500" powerconsumption="10" IsOn="true">
+      <LightComponent LightColor="220,255,150,200" range="2000" powerconsumption="10" IsOn="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="-0.01, 0.5" size="1.0,1.0" />
         <Upgrade gameversion="1.1.2.0" powerconsumption="10" />
       </LightComponent>
@@ -247,14 +247,14 @@
       <!-- Battery drain when using the light, adds up with propulsion -->
       <StatusEffect type="OnSecondaryUse" target="Contained" Condition="-0.05" />
     </Holdable>
-    <Propulsion force="150" usablein="water" particles="bubbles">
+    <Propulsion force="450" usablein="water" particles="bubbles">
       <RequiredItems items="mobilebattery" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" target="Contained" Condition="-0.2">
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
       <sound file="Content/Items/Diving/ScooterLoop.ogg" type="OnUse" range="500.0" loop="true" />
     </Propulsion>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery" />
     </ItemContainer>
@@ -262,15 +262,15 @@
   </Item>  
   <Item name="" identifier="abyssdivingsuit" category="Diving,Equipment" tags="diving,deepdiving,human" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="0.9" cargocontaineridentifier="">
     <Price baseprice="550" minleveldifficulty="35">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="2" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="6" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="6" />
     </Price>
     <PreferredContainer primary="divingsuitcontainer" />
     <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="1" minleveldifficulty="50" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.05" minleveldifficulty="50" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" minleveldifficulty="50" />
     <Deconstruct time="30">
       <Item identifier="titaniumaluminiumalloy" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -293,7 +293,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Abyss Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="0,409,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -336,9 +336,9 @@
       <StatValue stattype="WalkingSpeed" value="-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -394,15 +394,15 @@
   <Item name="" identifier="combatdivingsuit" category="Diving,Equipment" tags="diving,deepdiving,human" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="2" cargocontaineridentifier="">
     <Price baseprice="560" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="2" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="0.85" minavailable="6" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" minavailable="3"/>
+      <Price storeidentifier="merchantmilitary" minavailable="9"/>
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.85" minavailable="3"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.85" minavailable="9"/>
     </Price>
     <PreferredContainer primary="divingsuitcontainer" />
     <PreferredContainer primary="piratedivingsuitcontainer" spawnprobability="1" minleveldifficulty="35" />
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.05" minleveldifficulty="35"/>
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" minleveldifficulty="35"/>
     <Deconstruct time="30">
       <Item identifier="ballisticfiber" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -428,7 +428,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Combat Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="326,0,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -470,9 +470,9 @@
       <StatValue stattype="PropulsionSpeed" value="0.4" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
-      <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <Containable items="oxygensource,weldingtoolfuel" />
       <Containable items="oxygensource">
         <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
         <StatusEffect type="OnWearing" target="Contained" Condition="-0.3" comparison="And">
@@ -535,14 +535,14 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Respawn Diving Suit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="100,409,103,103" origin="0.5,0.5">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
           <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />
           <IsActive condition="gt 10.0"/>
         </LightComponent>      
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -608,7 +608,7 @@
 
   <Item name="" identifier="brokendivingsuit" category="Diving,Equipment" tags="deepdiving,human" scale="0.5" fireproof="false" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="0" cargocontaineridentifier="">
     <!-- lesser yield than regular diving suit, can't be sold -->
-    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.1" maxleveldifficulty="100" />
+    <PreferredContainer primary="wreckdivingsuitcontainer" spawnprobability="0.2" maxleveldifficulty="100" />
     <Deconstruct time="15" chooserandom="true" amount="1">
       <Item identifier="titanium" commonness="60" />
       <Item identifier="rubber" commonness="50" />
@@ -648,7 +648,7 @@
       <StatValue stattype="WalkingSpeed" value="-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use"/>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <Containable items="oxygensource,weldingtoolfuel" />
     </ItemContainer>
diff --git a/Content/Items/Door/doors.xml b/Content/Items/Door/doors.xml
index a152f6a4..47ebe90e 100644
--- a/Content/Items/Door/doors.xml
+++ b/Content/Items/Door/doors.xml
@@ -34,9 +34,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="windoweddoor" tags="door,weldable" scale="0.5" health="100" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" allowrotatingineditor="false" allowedlinks="structure,item" ondamagedthreshold="2" linkable="true">
@@ -73,9 +73,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="hatch" allowedlinks="gap,hull,structure,item" linkable="true" tags="door,weldable" scale="0.5" health="100" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" ondamagedthreshold="2" allowrotatingineditor="false">
@@ -114,9 +114,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="doorwbuttons" tags="door,weldable" scale="0.5" health="100" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" allowrotatingineditor="false" allowedlinks="structure,item" ondamagedthreshold="2" linkable="true">
@@ -157,9 +157,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="windoweddoorwbuttons" tags="door,weldable" scale="0.5" health="100" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" allowrotatingineditor="false" allowedlinks="structure,item" ondamagedthreshold="2" linkable="true">
@@ -200,9 +200,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="hatchwbuttons" allowedlinks="gap,hull,structure,item" linkable="true" tags="door,weldable" scale="0.5" health="100" requirebodyinsidetrigger="false" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" ondamagedthreshold="2" allowrotatingineditor="false">
@@ -244,9 +244,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
@@ -270,12 +270,12 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="255,0,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="0,255,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="0,0,113,209" depth="0.9" origin="0.5,0.5" alpha="1.0" />
@@ -285,11 +285,11 @@
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="power" displayname="connection.power" maxwires="6" maxplayerconnectablewires="5"/>
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock"/>
-      <output name="on_dock" displayname="connection.ondock" />
-      <output name="on_undock" displayname="connection.onundock" />
+      <output name="power" displayname="connection.power" maxwires="6" maxplayerconnectablewires="5"maxwires=10 />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock"maxwires=10 />
+      <output name="on_dock" displayname="connection.ondock" maxwires=10 />
+      <output name="on_undock" displayname="connection.onundock" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="dockinghatch" tags="dock" linkable="true" scale="0.5" indestructible="true" requirecursorinsidetrigger="true" requirebodyinsidetrigger="false" allowrotatingineditor="false">
@@ -312,12 +312,12 @@
     </DockingPort>
     <PowerTransfer CanBeOverloaded="false" FireProbability="0.0" />
     <Wire />
-    <LightComponent range="10.0" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="255,0,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="false" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0"  />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="0,255,0,0" scale="2.0" alphablend="false" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.9000.0" lightcolor="0,255,0,0"/>
       <IsActive targetitemcomponent="DockingPort" docked="true" />
       <Sprite texture="Content/Items/Door/dockingportlights.png" sourcerect="126,2,128,112" depth="0.9" origin="0.5,0.5" alpha="1.0"  />
@@ -327,11 +327,11 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="power" displayname="connection.power" maxwires="6" maxplayerconnectablewires="5"/>
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock"/>
-      <output name="on_dock" displayname="connection.ondock" />
-      <output name="on_undock" displayname="connection.onundock" />
+      <output name="power" displayname="connection.power" maxwires="6" maxplayerconnectablewires="5"maxwires=10 />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock"maxwires=10 />
+      <output name="on_dock" displayname="connection.ondock" maxwires=10 />
+      <output name="on_undock" displayname="connection.onundock" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="ductblock" tags="ductblock,weldable" scale="0.5" showinstatusmonitor="false" damagedbyrepairtools="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" allowrotatingineditor="false">
@@ -362,7 +362,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
     </ConnectionPanel>
   </Item>
 
@@ -400,9 +400,9 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"/>
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="activate_out" displayname="connection.activateout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout"maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="activate_out" displayname="connection.activateout" maxwires=10 />
     </ConnectionPanel>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Electricity/lights.xml b/Content/Items/Electricity/lights.xml
index d13c112c..12edb5d3 100644
--- a/Content/Items/Electricity/lights.xml
+++ b/Content/Items/Electricity/lights.xml
@@ -283,7 +283,7 @@
   <Item name="" identifier="lamp" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="304,528,64,96" depth="0.8" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="784,528,64,96" />
@@ -301,7 +301,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,528,80,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,528,80,112" origin="0.5,0.5" />
@@ -318,7 +318,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm02" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="80,528,80,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,528,80,112" />
@@ -335,7 +335,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm03" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="160,528,64,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="640,528,64,112" />
@@ -352,7 +352,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm04" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="224,528,80,112" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="704,528,80,112" origin="0.5,0.5" />
@@ -369,7 +369,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl01" category="Electrical" Tags="largeitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,816,240,64" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,816,240,64" />
@@ -386,7 +386,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl02" category="Electrical" Tags="largeitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,896,288,48" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/light_fluorescent_L2.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,896,288,48" />
@@ -403,7 +403,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,672,80,128" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,672,80,128" origin="0.5,0.5" />
@@ -420,7 +420,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm02" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="80,672,128,80" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,672,128,80" origin="0.5,0.5" />
@@ -437,7 +437,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm03" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="208,672,112,128" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="688,672,112,128" />
@@ -454,7 +454,7 @@
   <Item name="" nameidentifier="lamp" identifier="lighthalogenm04" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="320,672,128,96" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="800,672,128,96" origin="0.5,0.5" />
@@ -471,7 +471,7 @@
   <Item name="" nameidentifier="lamp" identifier="lightleds01" category="Electrical" Tags="smallitem,light" scale="0.5">
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="352,784,80,80" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <!-- additive "top light" -->
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="842,794,59,59" origin="0.5,0.5" />
@@ -489,7 +489,7 @@
     <Upgrade gameversion="0.10.0.0" scale="*0.5" />
     <Sprite texture="signalcomp.png" sourcerect="0,960,96,16" depth="0.8" />
     <!-- base texture -->
-    <LightComponent lightcolor="255,0,0,25" range="250.0" IsOn="true" castshadows="false" alphablend="true">
+    <LightComponent lightcolor="255,0,0,25" range="1000" IsOn="true" castshadows="false" alphablend="true">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,960,96,16" />
     </LightComponent>
diff --git a/Content/Items/Electricity/poweritems.xml b/Content/Items/Electricity/poweritems.xml
index b58ac750..ddadafcf 100644
--- a/Content/Items/Electricity/poweritems.xml
+++ b/Content/Items/Electricity/poweritems.xml
@@ -14,12 +14,12 @@
         <Conditional voltage="gt 0.1" />
       </StatusEffect>
     </PowerTransfer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="true" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="264,186,110,176" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq False" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1.5">
+    <LightComponent range="40" lightcolor="255,255,255,0" alphablend="true" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1.5">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0"/>
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="376,186,110,176" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerTransfer" overload="eq True" />
@@ -36,14 +36,14 @@
         <ParticleEmitter particle="ElectricShock" DistanceMin="10" DistanceMax="25" ParticleAmount="5" ScaleMin="0.1" ScaleMax="0.12" />
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="power" displayname="connection.power" />
-      <output name="signal_0" displayname="connection.signalx~[num]=0" fallbackdisplayname="connection.signalinx~[num]=0" />
-      <output name="signal_1" displayname="connection.signalx~[num]=1" fallbackdisplayname="connection.signalinx~[num]=1" />
-      <output name="signal_2" displayname="connection.signalx~[num]=2" fallbackdisplayname="connection.signalinx~[num]=2" />
-      <output name="signal_3" displayname="connection.signalx~[num]=3" fallbackdisplayname="connection.signalinx~[num]=3" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="power_value_out" displayname="connection.powervalueout" />
-      <output name="load_value_out" displayname="connection.loadvalueout" />
+      <output name="power" displayname="connection.power" maxwires=10 />
+      <output name="signal_0" displayname="connection.signalx~[num]=0" fallbackdisplayname="connection.signalinx~[num]=0" maxwires=10 />
+      <output name="signal_1" displayname="connection.signalx~[num]=1" fallbackdisplayname="connection.signalinx~[num]=1" maxwires=10 />
+      <output name="signal_2" displayname="connection.signalx~[num]=2" fallbackdisplayname="connection.signalinx~[num]=2" maxwires=10 />
+      <output name="signal_3" displayname="connection.signalx~[num]=3" fallbackdisplayname="connection.signalinx~[num]=3" maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="power_value_out" displayname="connection.powervalueout" maxwires=10 />
+      <output name="load_value_out" displayname="connection.loadvalueout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.1" mindeteriorationdelay="120" maxdeteriorationdelay="720" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -80,7 +80,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredSkill identifier="electrical" level="30" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="power" displayname="connection.power" />
+      <output name="power" displayname="connection.power" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.1" mindeteriorationdelay="120" maxdeteriorationdelay="720" mindeteriorationcondition="0" RepairThreshold="50" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,180" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
@@ -98,7 +98,7 @@
     <Sprite texture="signalcomp.png" sourcerect="604,0,118,159" depth="0.8" />
     <BrokenSprite texture="signalcomp.png" sourcerect="722,0,118,159" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="signalcomp.png" sourcerect="840,0,118,159" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="65,33" indicatorsize="34,46" ishorizontal="false" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="50" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="65,33" indicatorsize="34,46" ishorizontal="false" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" /> <!--minsize="350,250" maxsize="420,300"-->
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0" comparison="and">
         <!-- the statuseffect targets the contained item (a battery cell that's being charged), but the conditional targets the container (this battery) -->
@@ -118,18 +118,18 @@
         <ParticleEmitter particle="ElectricShock" DistanceMin="10" DistanceMax="25" ParticleAmount="5" ScaleMin="0.1" ScaleMax="0.12" />
       </StatusEffect>
       <requireditem items="Screwdriver" type="Equipped" />
-      <output name="power_out" displayname="connection.powerout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
       <input name="power_in" displayname="connection.powerin" />
       <input name="set_rate" displayname="connection.batterysetrechargespeed" />
-      <output name="charge" displayname="connection.batterychargestatusout" />
-      <output name="charge_%" displayname="connection.batterychargepercentage" />
-      <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="load_value_out" displayname="connection.loadvalueout" />
-      <output name="power_value_out" displayname="connection.powervalueout" />
+      <output name="charge" displayname="connection.batterychargestatusout" maxwires=10 />
+      <output name="charge_%" displayname="connection.batterychargepercentage" maxwires=10 />
+      <output name="charge_rate" displayname="connection.batteryrechargespeedout" maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="load_value_out" displayname="connection.loadvalueout" maxwires=10 />
+      <output name="power_value_out" displayname="connection.powervalueout" maxwires=10 />
       <input name="disable_output" displayname="connection.disableoutput" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="9" maxstacksize="60" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
@@ -162,7 +162,7 @@
     <Sprite texture="signalcomp.png" sourcerect="604,207,118,124" depth="0.8" />
     <BrokenSprite texture="signalcomp.png" sourcerect="722,207,118,124" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="signalcomp.png" sourcerect="840,207,118,124" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="2000.0" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="21,12" indicatorsize="54,35" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="50" maxrechargespeed="500.0" maxoutput="1000.0" canbeselected="true" indicatorposition="21,12" indicatorsize="54,35" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" /> <!--minsize="350,250" maxsize="420,300"-->
       <StatusEffect type="OnActive" targettype="Contained" targets="loadable" Condition="2.0" comparison="and">
         <!-- the statuseffect targets the contained item (a battery cell that's being charged), but the conditional targets the container (this battery) -->
@@ -182,18 +182,18 @@
         <ParticleEmitter particle="ElectricShock" DistanceMin="10" DistanceMax="25" ParticleAmount="5" ScaleMin="0.1" ScaleMax="0.12" />
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="power_out" displayname="connection.powerout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
       <input name="power_in" displayname="connection.powerin" />
       <input name="set_rate" displayname="connection.batterysetrechargespeed" />
-      <output name="charge" displayname="connection.batterychargestatusout" />
-      <output name="charge_%" displayname="connection.batterychargepercentage" />
-      <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="load_value_out" displayname="connection.loadvalueout" />
-      <output name="power_value_out" displayname="connection.powervalueout" />
+      <output name="charge" displayname="connection.batterychargestatusout" maxwires=10 />
+      <output name="charge_%" displayname="connection.batterychargepercentage" maxwires=10 />
+      <output name="charge_rate" displayname="connection.batteryrechargespeedout" maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="load_value_out" displayname="connection.loadvalueout" maxwires=10 />
+      <output name="power_value_out" displayname="connection.powervalueout" maxwires=10 />
       <input name="disable_output" displayname="connection.disableoutput" />
     </ConnectionPanel>
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
+    <ItemContainer capacity="9" maxstacksize="60" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="ChargingDock">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
@@ -208,7 +208,7 @@
     <Sprite texture="signalcomp.png" depth="0.8" sourcerect="512,334,154,160" />
     <BrokenSprite texture="signalcomp.png" sourcerect="667,334,155,161" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="signalcomp.png" sourcerect="821,334,155,161" depth="0.8" maxcondition="0" />
-    <PowerContainer capacity="20.0" rechargespeed="0" maxrechargespeed="1000.0" maxoutput="20000000.0" efficiency="0.1" exponentialrechargespeed="true" rechargeadjustspeed="0.1" rechargewarningindicatorlow="0.5" rechargewarningindicatorhigh="0.75" canbeselected="true" indicatorposition="53,11" indicatorsize="47,10" ishorizontal="true" msg="ItemMsgInteractSelect">
+    <PowerContainer capacity="50" rechargespeed="0" maxrechargespeed="1000.0" maxoutput="20000000.0" efficiency="0.1" exponentialrechargespeed="true" rechargeadjustspeed="0.1" rechargewarningindicatorlow="0.5" rechargewarningindicatorhigh="0.75" canbeselected="true" indicatorposition="53,11" indicatorsize="47,10" ishorizontal="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.23" minsize="350,200" anchor="Center" style="ItemUI" />
       <Upgrade gameversion="0.16.7.0" maxrechargespeed="1000"/>
       <Upgrade gameversion="0.16.7.0" maxoutput="20000000.0"/>
@@ -225,18 +225,18 @@
         <ParticleEmitter particle="ElectricShock" DistanceMin="10" DistanceMax="25" ParticleAmount="5" ScaleMin="0.1" ScaleMax="0.12" />
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="power_out" displayname="connection.powerout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
       <input name="power_in" displayname="connection.powerin" />
-      <output name="charge" displayname="connection.batterychargestatusout" />
-      <output name="charge_%" displayname="connection.batterychargepercentage" />
-      <output name="charge_rate" displayname="connection.batteryrechargespeedout" />
+      <output name="charge" displayname="connection.batterychargestatusout" maxwires=10 />
+      <output name="charge_%" displayname="connection.batterychargepercentage" maxwires=10 />
+      <output name="charge_rate" displayname="connection.batteryrechargespeedout" maxwires=10 />
       <input name="set_rate" displayname="connection.batterysetrechargespeed" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="load_value_out" displayname="connection.loadvalueout" />
-      <output name="power_value_out" displayname="connection.powervalueout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="load_value_out" displayname="connection.loadvalueout" maxwires=10 />
+      <output name="power_value_out" displayname="connection.powervalueout" maxwires=10 />
       <input name="disable_output" displayname="connection.disableoutput" />
     </ConnectionPanel>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" alphablend="true" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" alphablend="true" pulsefrequency="0.4" pulseamount="0.4" powerconsumption="1" IsOn="false" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="358,334,154,160" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <IsActive targetitemcomponent="PowerContainer" rechargeratio="gt 0.7" />
       <IsActive targetitemcomponent="PowerContainer" currpowerconsumption="gt 500" />
@@ -264,21 +264,21 @@
     </Repairable>
   </Item>
   
-  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="8" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="batterycell" category="Equipment,Electrical" maxstacksize="60" tags="smallitem,loadable,mobilebattery" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="batterycellrecharger" maxcondition="80"/>
-    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1.0" mincondition="25"/>
-    <PreferredContainer secondary="divingcab" amount="3" spawnprobability="1" notcampaign="true" />
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab,outpostengcab" minamount="1" maxamount="2" spawnprobability="0.1"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" spawnprobability="1" mincondition="25"/>
+    <PreferredContainer secondary="divingcab" amount="6" spawnprobability="1" notcampaign="true" />
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab,outpostengcab" minamount="2" maxamount="4" spawnprobability="0.2"/>
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1"/>
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
     <Upgrade gameversion="0.10.0.0" scale="0.5"/>
-    <Price baseprice="125" minavailable="7">
-      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="5"/>
-      <Price storeidentifier="merchantcity" minavailable="4"/>
+    <Price baseprice="125" minavailable="21">
+      <Price storeidentifier="merchantoutpost" multiplier="0.9" minavailable="15"/>
+      <Price storeidentifier="merchantcity" minavailable="12"/>
       <Price storeidentifier="merchantresearch" multiplier="1.2" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" minavailable="6"/>
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmine" minavailable="18"/>
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -295,23 +295,23 @@
     <Body width="32" height="20" density="30" />
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
   
-  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="8" tags="smallitem,loadable,mobilebattery" health="200" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulguriumbatterycell" category="Equipment,Electrical" maxstacksize="60" tags="smallitem,loadable,mobilebattery" health="200" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5"/>
     <PreferredContainer primary="batterycellrecharger" maxcondition="80"/>
     <PreferredContainer primary="stunbaton,underwaterscooter,handheldsonar,sonarbeacon,flashlight,portablepump,poweredcontainer" mincondition="25"/>
     <PreferredContainer secondary="divingcab,engcab,reactorcab"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="250" minavailable="1" minleveldifficulty="15">
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="250" minavailable="3" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
       <Price storeidentifier="merchantcity" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="zinc" />
@@ -327,7 +327,7 @@
     <Body width="32" height="20" density="30" />
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect" />
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
   
@@ -361,7 +361,7 @@
       <ParticleEmitter particle="fleshsmoke" particlespersecond="2" scalemin="1" scalemax="2" mincondition="0.0" maxcondition="50.0" />
       <input name="power_in" displayname="connection.powerin" />
     </ConnectionPanel>
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hideitems="false" itempos="24,10" iteminterval="23,0" itemrotation="-90" uilabel="ChargingDock" containedspritedepth="0.81">
+    <ItemContainer capacity="12" maxstacksize="60" canbeselected="true" hideitems="false" itempos="24,10" iteminterval="23,0" itemrotation="-90" uilabel="ChargingDock" containedspritedepth="0.81">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
diff --git a/Content/Items/Electricity/signalitems.xml b/Content/Items/Electricity/signalitems.xml
index 347a7eb4..98a3710b 100644
--- a/Content/Items/Electricity/signalitems.xml
+++ b/Content/Items/Electricity/signalitems.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="circuitbox" category="Electrical" Tags="smallitem" maxstacksize="1" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" disablecommandmenuwhenselected="true" grabwhenselected="true">
+  <Item name="" identifier="circuitbox" category="Electrical" Tags="smallitem" maxstacksize="60" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" disablecommandmenuwhenselected="true" grabwhenselected="true">
     <PreferredContainer primary="engcab"/>
     <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="192,258,64,64" depth="0.8" canflipx="false" origin="0.5,0.5" />
     <Body width="51" height="51" density="30" />
@@ -40,22 +40,22 @@
       <input name="signal_in6" displayname="connection.signalinx~[num]=6" />
       <input name="signal_in7" displayname="connection.signalinx~[num]=7" />
       <input name="signal_in8" displayname="connection.signalinx~[num]=8" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
-      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" />
-      <output name="signal_out3" displayname="connection.signaloutx~[num]=3" />
-      <output name="signal_out4" displayname="connection.signaloutx~[num]=4" />
-      <output name="signal_out5" displayname="connection.signaloutx~[num]=5" />
-      <output name="signal_out6" displayname="connection.signaloutx~[num]=6" />
-      <output name="signal_out7" displayname="connection.signaloutx~[num]=7" />
-      <output name="signal_out8" displayname="connection.signaloutx~[num]=8" />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
+      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" maxwires=10 />
+      <output name="signal_out3" displayname="connection.signaloutx~[num]=3" maxwires=10 />
+      <output name="signal_out4" displayname="connection.signaloutx~[num]=4" maxwires=10 />
+      <output name="signal_out5" displayname="connection.signaloutx~[num]=5" maxwires=10 />
+      <output name="signal_out6" displayname="connection.signaloutx~[num]=6" maxwires=10 />
+      <output name="signal_out7" displayname="connection.signaloutx~[num]=7" maxwires=10 />
+      <output name="signal_out8" displayname="connection.signaloutx~[num]=8" maxwires=10 />
     </ConnectionPanel>
     <!-- container for components -->
-    <ItemContainer capacity="64" maxstacksize="1" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
-      <Containable items="circuitboxcomponent" />
+    <ItemContainer capacity="50" maxstacksize="60" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
+      <Containable items="circuitboxcomponent,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <!-- container for wires -->
-    <ItemContainer capacity="10" maxstacksize="32" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
-      <Containable items="wire" />
+    <ItemContainer capacity="30" maxstacksize="60" canbeselected="false" allowdraganddrop="false" drawinventory="false" QuickUseMovesItemsInside="false">
+      <Containable items="wire,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
     <CircuitBox selectkey="Select" canbeselected="true" msg="ItemMsgInteractSelect" allowuioverlap="true">
       <Requireditem items="idcard" type="Picked" msg="itemmsgunauthorizedaccess" ignoreineditor="true"/>
@@ -66,7 +66,7 @@
       <ConnectionScrewSprite texture="Content/UI/UIAtlasDevices.png" sourcerect="88,92,45,45" origin="0.5,0.5" />
     </CircuitBox>
   </Item>
-  <Item name="" identifier="wire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="210,215,218,255" InventoryIconColor="210,215,218,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="wire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="210,215,218,255" InventoryIconColor="210,215,218,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -76,7 +76,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,64,64,64" origin="0.5,0.5" />
     <Sprite texture="signalcomp.png" depth="0.8" sourcerect="169,224,84,32" origin="0.5,0.5" />
@@ -84,7 +84,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="redwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="254,23,17,255" InventoryIconColor="254,23,17,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="redwire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="254,23,17,255" InventoryIconColor="254,23,17,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -93,8 +93,8 @@
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" />
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -106,7 +106,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="bluewire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="51,121,173,255" InventoryIconColor="51,121,173,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="bluewire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="51,121,173,255" InventoryIconColor="51,121,173,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -115,8 +115,8 @@
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -128,7 +128,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="orangewire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="255,140,13,255" InventoryIconColor="255,140,13,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="orangewire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="255,140,13,255" InventoryIconColor="255,140,13,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -137,8 +137,8 @@
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -150,7 +150,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="greenwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="56,143,111,255" InventoryIconColor="56,143,111,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="greenwire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="56,143,111,255" InventoryIconColor="56,143,111,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -159,8 +159,8 @@
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -172,7 +172,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="blackwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="50,50,50,255" InventoryIconColor="50,50,50,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="blackwire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="50,50,50,255" InventoryIconColor="50,50,50,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -181,8 +181,8 @@
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -194,7 +194,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="brownwire" category="Electrical" Tags="smallitem,wire" maxstacksize="32" maxstacksizecharacterinventory="8" spritecolor="123,77,62,255" InventoryIconColor="123,77,62,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="brownwire" category="Electrical" Tags="smallitem,wire" maxstacksize="60" maxstacksizecharacterinventory="60" spritecolor="123,77,62,255" InventoryIconColor="123,77,62,255" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="10">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -203,8 +203,8 @@
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
-    <PreferredContainer primary="engcab" amount="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="engcab" amount="2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2" />
     <Deconstruct time="1"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="5" amount="5">
       <RequiredItem identifier="copper" />
@@ -216,7 +216,7 @@
     <Holdable slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
     <Wire />
   </Item>
-  <Item name="" identifier="fpgacircuit" category="Electrical" Tags="smallitem,signal" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fpgacircuit" category="Electrical" Tags="smallitem,signal" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -226,7 +226,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="5">
       <Item identifier="copper" />
     </Deconstruct>
@@ -252,7 +252,7 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="andcomponent" category="Electrical" Tags="smallitem,logic, circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6c7dd5">
+  <Item name="" identifier="andcomponent" category="Electrical" Tags="smallitem,logic, circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6c7dd5">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -262,7 +262,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -274,7 +274,7 @@
     <AndComponent canbeselected="true" />
     <Body width="31" height="25" density="15" />
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="85,-10" handle1="0,0" attachable="true" aimable="true">
-      <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
+      <RequiredItem items="wrench,deattachtool" type="Equipped" />
     </Holdable>
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
@@ -282,10 +282,10 @@
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
       <input name="set_output" displayname="connection.setoutput" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="equalscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
+  <Item name="" identifier="equalscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -295,7 +295,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -314,11 +314,11 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
       <input name="set_output" displayname="connection.setoutput" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="greatercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
+  <Item name="" identifier="greatercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -328,7 +328,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -347,11 +347,11 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
       <input name="set_output" displayname="connection.setoutput" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="addercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
+  <Item name="" identifier="addercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a1d681">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -361,7 +361,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -380,10 +380,10 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="colorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#b3b3b4">
+  <Item name="" identifier="colorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#b3b3b4">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -393,7 +393,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -414,10 +414,10 @@
       <input name="signal_g" displayname="connection.signalg" />
       <input name="signal_b" displayname="connection.signalb" />
       <input name="signal_a" displayname="connection.signala" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="subtractcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a0dbc8">
+  <Item name="" identifier="subtractcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a0dbc8">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -427,7 +427,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -446,10 +446,10 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="multiplycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
+  <Item name="" identifier="multiplycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -459,7 +459,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -478,10 +478,10 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="dividecomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
+  <Item name="" identifier="dividecomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8bafd7">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -491,7 +491,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -510,10 +510,10 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="powcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#9b7eff">
+  <Item name="" identifier="powcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="false" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#9b7eff">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -523,7 +523,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -542,10 +542,10 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
       <input name="set_exponent" displayname="connection.setexponent" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="orcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#d1b788">
+  <Item name="" identifier="orcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#d1b788">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -555,7 +555,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -575,10 +575,10 @@
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
       <input name="set_output" displayname="connection.setoutput" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="xorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#c3a27a">
+  <Item name="" identifier="xorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#c3a27a">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -588,7 +588,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -608,10 +608,10 @@
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
       <input name="set_output" displayname="connection.setoutput" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="notcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ad7a79">
+  <Item name="" identifier="notcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ad7a79">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -621,7 +621,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -639,10 +639,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="concatcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#eb5505">
+  <Item name="" identifier="concatcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#eb5505">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -652,7 +652,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -671,10 +671,10 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="signal_in1" displayname="connection.signalinx~[num]=1" />
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="sincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#38a54f">
+  <Item name="" identifier="sincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#38a54f">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -684,7 +684,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -702,10 +702,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="coscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#3d9d9e">
+  <Item name="" identifier="coscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#3d9d9e">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -715,7 +715,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -733,10 +733,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="tancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8e5a4c">
+  <Item name="" identifier="tancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#8e5a4c">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -746,7 +746,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -764,10 +764,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="asincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a56dc2">
+  <Item name="" identifier="asincomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a56dc2">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -777,7 +777,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -795,10 +795,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="acoscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#7594ba">
+  <Item name="" identifier="acoscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#7594ba">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -808,7 +808,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -826,10 +826,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="atancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6cabbc">
+  <Item name="" identifier="atancomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6cabbc">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -839,7 +839,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -859,10 +859,10 @@
       <input name="signal_in" displayname="connection.signalin" />
       <input name="signal_in_x" displayname="connection.signalinx~[num]=x" />
       <input name="signal_in_y" displayname="connection.signalinx~[num]=y" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="roundcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#404095">
+  <Item name="" identifier="roundcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#404095">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -872,7 +872,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -890,10 +890,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="ceilcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#983f3c">
+  <Item name="" identifier="ceilcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#983f3c">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -903,7 +903,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -921,10 +921,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="floorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#50884d">
+  <Item name="" identifier="floorcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#50884d">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -934,7 +934,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -952,10 +952,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="factorialcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#563697">
+  <Item name="" identifier="factorialcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#563697">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -965,7 +965,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -983,10 +983,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="abscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#2fdca2">
+  <Item name="" identifier="abscomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#2fdca2">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -996,7 +996,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1014,10 +1014,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="squarerootcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ff8e70">
+  <Item name="" identifier="squarerootcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#ff8e70">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1027,7 +1027,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1045,10 +1045,10 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="modulocomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#1745b7">
+  <Item name="" identifier="modulocomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#1745b7">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1058,7 +1058,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1077,10 +1077,10 @@
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
       <input name="set_modulus" displayname="connection.setmodulus" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="relaycomponent" category="Electrical" Tags="smallitem,signal,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
+  <Item name="" identifier="relaycomponent" category="Electrical" Tags="smallitem,signal,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#694341">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1090,7 +1090,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1114,15 +1114,15 @@
       <input name="signal_in2" displayname="connection.signalinx~[num]=2" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="power_out" displayname="connection.powerout" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
-      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
-      <output name="load_value_out" displayname="connection.loadvalueout" />
-      <output name="power_value_out" displayname="connection.powervalueout" />
+      <output name="power_out" displayname="connection.powerout" maxwires=10 />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
+      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" maxwires=10 />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
+      <output name="load_value_out" displayname="connection.loadvalueout" maxwires=10 />
+      <output name="power_value_out" displayname="connection.powervalueout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="delaycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#5e76a2">
+  <Item name="" identifier="delaycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#5e76a2">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1132,7 +1132,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1150,11 +1150,11 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
       <input name="set_delay" displayname="connection.setdelay" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="memorycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a66c6b">
+  <Item name="" identifier="memorycomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" linkable="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#a66c6b">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1164,7 +1164,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1183,10 +1183,10 @@
       <requireditem items="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
       <input name="lock_state" aliases="signal_store" displayname="connection.lockstate" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="lightcomponent" category="Electrical" Tags="smallitem,lightcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="lightcomponent" category="Electrical" Tags="smallitem,lightcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="110" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1196,7 +1196,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="phosphorus" />
@@ -1224,7 +1224,7 @@
       <input name="set_color" displayname="connection.setcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="lightcomponent90" nameidentifier="lightcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" Aliases="Light Component 90Deg" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="lightcomponent90" nameidentifier="lightcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" Aliases="Light Component 90Deg" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="110" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1234,7 +1234,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="phosphorus" />
@@ -1262,7 +1262,7 @@
       <input name="set_color" displayname="connection.setcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="lightcomponentround" nameidentifier="lightcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="lightcomponentround" nameidentifier="lightcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" category="Electrical" Tags="smallitem,lightcomponent" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="110" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1272,7 +1272,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
       <Item identifier="phosphorus" />
@@ -1300,7 +1300,7 @@
       <input name="set_color" displayname="connection.setcolor" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="oxygendetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="oxygendetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1310,7 +1310,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1332,11 +1332,11 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="signal_out" displayname="connection.signalout" />
-      <output name="low_oxygen" displayname="connection.low_oxygen" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
+      <output name="low_oxygen" displayname="connection.low_oxygen" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="waterdetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="waterdetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="130" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1346,7 +1346,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.5.0" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1368,12 +1368,12 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="signal_out" displayname="connection.signalout" />
-      <output name="water_%" displayname="connection.waterpercentageout" />
-      <output name="high_pressure" displayname="connection.highpressureout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
+      <output name="water_%" displayname="connection.waterpercentageout" maxwires=10 />
+      <output name="high_pressure" displayname="connection.highpressureout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="smokedetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="smokedetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="130" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1383,7 +1383,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.3.1" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1405,10 +1405,10 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="motiondetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="motiondetector" category="Electrical" Tags="smallitem,sensor" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="130" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1418,7 +1418,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Upgrade gameversion="0.9.5.0" scale="0.5" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
@@ -1440,10 +1440,10 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="signalcheckcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#4f6e3f">
+  <Item name="" identifier="signalcheckcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#4f6e3f">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1453,7 +1453,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1473,10 +1473,10 @@
       <input name="signal_in" displayname="connection.signalin" />
       <input name="set_output" displayname="connection.setoutput" />
       <input name="set_targetsignal" displayname="connection.settargetsignal" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="regexcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#424d8f">
+  <Item name="" identifier="regexcomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#424d8f">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1486,7 +1486,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1504,11 +1504,11 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
       <input name="set_output" displayname="connection.setoutput" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="oscillator" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#987c6c">
+  <Item name="" identifier="oscillator" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#987c6c">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1518,7 +1518,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1537,10 +1537,10 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="set_frequency" displayname="connection.setfrequency" />
       <input name="set_outputtype" displayname="connection.setoutputtype" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="wificomponent" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6e514e">
+  <Item name="" identifier="wificomponent" category="Electrical" Tags="smallitem,signal,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true" signalcomponentcolor="#6e514e">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" /> 
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1550,7 +1550,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1568,11 +1568,11 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
       <input name="set_channel" displayname="connection.setchannel" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="multiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="228,76,67,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="multiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="228,76,67,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1582,7 +1582,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1611,11 +1611,11 @@
       <input name="signal_in9" displayname="connection.signalinx~[num]=9" />
       <input name="set_input" displayname="connection.setinput" />
       <input name="move_input" displayname="connection.moveinput" />
-      <output name="signal_out" displayname="connection.signalout" />
-      <output name="selected_input_out" displayname="connection.selectedinputout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
+      <output name="selected_input_out" displayname="connection.selectedinputout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="demultiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="130,157,92,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="demultiplexercomponent" category="Electrical" Tags="smallitem,logic,circuitboxcomponent" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" description="" signalcomponentcolor="130,157,92,255" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1625,7 +1625,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="fpgacircuit" />
     </Deconstruct>
@@ -1645,20 +1645,20 @@
       <input name="signal_in" displayname="connection.signalin" />
       <input name="set_output" displayname="connection.setoutput" />
       <input name="move_output" displayname="connection.moveoutput" />
-      <output name="signal_out0" displayname="connection.signaloutx~[num]=0" />
-      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" />
-      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" />
-      <output name="signal_out3" displayname="connection.signaloutx~[num]=3" />
-      <output name="signal_out4" displayname="connection.signaloutx~[num]=4" />
-      <output name="signal_out5" displayname="connection.signaloutx~[num]=5" />
-      <output name="signal_out6" displayname="connection.signaloutx~[num]=6" />
-      <output name="signal_out7" displayname="connection.signaloutx~[num]=7" />
-      <output name="signal_out8" displayname="connection.signaloutx~[num]=8" />
-      <output name="signal_out9" displayname="connection.signaloutx~[num]=9" />
-      <output name="selected_output_out" displayname="connection.selectedoutputout" />
+      <output name="signal_out0" displayname="connection.signaloutx~[num]=0" maxwires=10 />
+      <output name="signal_out1" displayname="connection.signaloutx~[num]=1" maxwires=10 />
+      <output name="signal_out2" displayname="connection.signaloutx~[num]=2" maxwires=10 />
+      <output name="signal_out3" displayname="connection.signaloutx~[num]=3" maxwires=10 />
+      <output name="signal_out4" displayname="connection.signaloutx~[num]=4" maxwires=10 />
+      <output name="signal_out5" displayname="connection.signaloutx~[num]=5" maxwires=10 />
+      <output name="signal_out6" displayname="connection.signaloutx~[num]=6" maxwires=10 />
+      <output name="signal_out7" displayname="connection.signaloutx~[num]=7" maxwires=10 />
+      <output name="signal_out8" displayname="connection.signaloutx~[num]=8" maxwires=10 />
+      <output name="signal_out9" displayname="connection.signaloutx~[num]=9" maxwires=10 />
+      <output name="selected_output_out" displayname="connection.selectedoutputout" maxwires=10 />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="emergencysiren" category="Electrical" Tags="smallitem,sound" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="emergencysiren" category="Electrical" Tags="smallitem,sound" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="150" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1668,7 +1668,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
       <Item identifier="copper" />
@@ -1685,7 +1685,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="0.68" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="0.68" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="302,894,40,62" origin="0.5,0.5" alpha="1.0" />
       <sound file="Content/Items/WarningSiren.ogg" type="OnActive" range="2000.0" loop="true" volume="0.5" selectionmode="Manual" />
       <sound file="Content/Items/AlarmDivingLoop.ogg" type="OnActive" range="2500.0" loop="true" volume="0.5" selectionmode="Manual" />
@@ -1704,7 +1704,7 @@
       <input name="set_state" displayname="connection.setstate" />
     </ConnectionPanel>
   </Item>
-  <Item name="" identifier="alarmbuzzer" category="Electrical" Tags="smallitem,sound" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
+  <Item name="" identifier="alarmbuzzer" category="Electrical" Tags="smallitem,sound" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true" GrabWhenSelected="true">
     <Price baseprice="100" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -1714,7 +1714,7 @@
       <Price storeidentifier="merchantengineering" multiplier="0.9" />
     </Price>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.1" />
     <Deconstruct time="10">
       <Item identifier="plastic" />
       <Item identifier="copper" />
@@ -1731,7 +1731,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="5.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="20">
+    <LightComponent canbeselected="false" lightcolor="255,0,0,100" alphablend="true" castshadows="false" blinkfrequency="2.6" range="80">
       <Sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="301,963,42,57" origin="0.5,0.5" alpha="1.0" />
       <sound file="Content/Items/AlarmBuzzerLoop.ogg" type="OnActive" range="1000.0" loop="true" volume="0.5" />
       <StatusEffect type="OnContained" target="This" IsActive="false">
@@ -1803,7 +1803,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="signal_in" displayname="connection.signalin" />
-      <output name="signal_out" displayname="connection.signalout" />
+      <output name="signal_out" displayname="connection.signalout" maxwires=10 />
       <input name="set_text_color" displayname="connection.settextcolor" />
       <input name="clear_text" displayname="connection.cleartext" />
     </ConnectionPanel>
@@ -1821,15 +1821,15 @@
     </Terminal>
   </Item>
   <Item name="" identifier="electriciansgoggles" scale="0.5" category="Equipment" tags="smallitem" allowasextracargo="true" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="engcab" amount="1"/>
-    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.03" />
-    <Price baseprice="150" minavailable="1">
+    <PreferredContainer primary="engcab" amount="2"/>
+    <PreferredContainer secondary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.06" />
+    <Price baseprice="150" minavailable="3">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="8" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="24" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="copper" />
diff --git a/Content/Items/Engine/engine.xml b/Content/Items/Engine/engine.xml
index a186df8b..58bfb709 100644
--- a/Content/Items/Engine/engine.xml
+++ b/Content/Items/Engine/engine.xml
@@ -23,11 +23,11 @@
         <Affliction identifier="bleeding" strength="10" />
       </propellerdamage>
     </Engine>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0"  IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0"  IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="664,0,659,317" origin="0.5,0.5" alpha="0.2" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Repairable" StressDeteriorationMultiplier="gt 2.0" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="664,0,659,317" origin="0.5,0.5" alpha="0.2" />
       <StatusEffect type="OnActive" target="This">
@@ -48,7 +48,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
       <input name="set_force" displayname="connection.setforce" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="300" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25"                 
                 StressDeteriorationThreshold="0.9" MaxStressDeteriorationMultiplier="6" StressDeteriorationIncreaseSpeed="0.05" StressDeteriorationDecreaseSpeed="0.1"
@@ -90,16 +90,16 @@
         <Affliction identifier="bleeding" strength="10" />
       </propellerdamage>
     </Engine>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="0,933,1613,592" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <Upgrade gameversion="0.13.0.9" lightcolor="255,255,255,0" />
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="0,933,1613,592" origin="0.5,0.5" alpha="0.2" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,0,0,0" blinkfrequency="1" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Repairable" StressDeteriorationMultiplier="gt 2.0" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="0,933,1613,592" origin="0.5,0.5" alpha="0.2" />
       <StatusEffect type="OnActive" target="This">
@@ -120,7 +120,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
       <input name="set_force" displayname="connection.setforce" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="300" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25"                
                 StressDeteriorationThreshold="0.9" MaxStressDeteriorationMultiplier="6" StressDeteriorationIncreaseSpeed="0.05" StressDeteriorationDecreaseSpeed="0.1"
@@ -159,7 +159,7 @@
         <Affliction identifier="bleeding" strength="10" />
       </propellerdamage>
     </Engine>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Engine" currentvolume="gt 0.01" />
       <sprite texture="Content/Items/Engine/Engines.png" depth="0.025" sourcerect="1614,867,426,178" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
@@ -177,7 +177,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
       <input name="set_force" displayname="connection.setforce" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
       <GuiFrame relativesize="0.2,0.16" minsize="400,200" maxsize="480,280" anchor="Center" relativeoffset="0.0,0.27" style="ItemUI" />
diff --git a/Content/Items/Fabricators/fabricators.xml b/Content/Items/Fabricators/fabricators.xml
index ff4acf55..9e8c7a91 100644
--- a/Content/Items/Fabricators/fabricators.xml
+++ b/Content/Items/Fabricators/fabricators.xml
@@ -33,11 +33,11 @@
       <IsActiveConditional Condition="gt 0.0" />
     </DecorativeSprite>
 
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="351,624,336,400" alpha="1.0" />
     </LightComponent>
 
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" blinkfrequency="1" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="688,624,336,400" alpha="1.0" />
     </LightComponent>
     
@@ -61,7 +61,7 @@
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped"/>
       <input name="power_in" displayname="connection.powerin"/>
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
 
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.50" mindeteriorationdelay="60" maxdeteriorationdelay="120" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
@@ -78,7 +78,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="15" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
   </Item>
 
@@ -104,7 +104,7 @@
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="336,0,336,288" origin="0.5,0.5" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="672,0,336,288" origin="0.5,0.5" depth="0.8" maxcondition="0" />
 
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="688,339,336,288" alpha="1.0" />
     </LightComponent>
 
@@ -128,7 +128,7 @@
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped"/>
       <input name="power_in" displayname="connection.powerin"/>
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
 
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.50" mindeteriorationdelay="60" maxdeteriorationdelay="120" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
@@ -145,7 +145,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="15" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
   </Item>
 
@@ -169,7 +169,7 @@
     <Sprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" depth="0.8" sourcerect="0,304,256,320"/>
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="272,304,256,320" depth="0.8" maxcondition="80" fadein="true" />
     <BrokenSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" sourcerect="544,304,256,320" depth="0.8" maxcondition="0" />
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="5" IsOn="true" castshadows="false" alphablend="false" allowingameediting="false">
       <sprite texture="Content/Items/Command/navigatorLights.png" depth="0.025" sourcerect="0,665,256,320" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <DecorativeSprite texture="Content/Items/Fabricators/FabricatorsAndDeconstructors.png" depth="0.84" sourcerect="866,484,156,105"/>
@@ -224,7 +224,7 @@
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped"/>
       <input name="power_in" displayname="connection.powerin"/>
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
 
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.50" mindeteriorationdelay="60" maxdeteriorationdelay="120" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
@@ -240,7 +240,7 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer capacity="3" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="9" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="15" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="4" uilabel="" allowuioverlap="true"/>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Gardening/ballastflora.xml b/Content/Items/Gardening/ballastflora.xml
index aec0f213..0e19aa04 100644
--- a/Content/Items/Gardening/ballastflora.xml
+++ b/Content/Items/Gardening/ballastflora.xml
@@ -11,7 +11,7 @@
                       roothealth="200"
                       rootcolor="255,150,150,255"
                       maxanger="5" 
-                      maxpowercapacity="10000"
+                      maxpowercapacity="50"
                       explosionresistance="0.8"
                       submergedwaterresistance="0.5"
                       firevulnerability="10.0"
diff --git a/Content/Items/Gardening/gardeningtools.xml b/Content/Items/Gardening/gardeningtools.xml
index 810bd168..1a8be079 100644
--- a/Content/Items/Gardening/gardeningtools.xml
+++ b/Content/Items/Gardening/gardeningtools.xml
@@ -4,14 +4,14 @@
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,384,128,128" depth="0.75" premultiplyalpha="false" origin="0.5,0.5" />
     <Body width="95" height="106" density="25" />
     <Price baseprice="120" minleveldifficulty="1">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetach" PickingTime="5.0" aimpos="85,-10" handle1="0,0" attachable="true" aimable="true" />
     <Fabricate suitablefabricators="fabricator" requiredtime="45">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -23,10 +23,10 @@
       <Item identifier="steel" mincondition="0.5" />
       <Item identifier="plastic" mincondition="1" />
     </Deconstruct>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" drawinventory="false" uilabel="" allowuioverlap="true" allowdraganddrop="false" showcontainedstateindicator="false">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" drawinventory="false" uilabel="" allowuioverlap="true" allowdraganddrop="false" showcontainedstateindicator="false">
       <Containable items="seed" />
     </ItemContainer>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.025" sourcerect="896,512,128,128" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Planter selectkey="Select" canbepicked="true" pickingtime="5.0" msg="ItemMsgPlantSeed">
@@ -40,15 +40,15 @@
     <InventoryIcon texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,0,128,128" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="896,0,128,128" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="80" minleveldifficulty="1">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
     </Price>
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Body width="121" height="96" density="15" />
     <Fabricate suitablefabricators="fabricator" requiredtime="35">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -65,18 +65,18 @@
     </RepairTool>
   </Item>
   
-  <Item name="" identifier="fertilizer" tags="fertilizer,smallitem" maxstacksize="8" category="Misc" scale="0.5" health="800">
+  <Item name="" identifier="fertilizer" tags="fertilizer,smallitem" maxstacksize="60" category="Misc" scale="0.5" health="800">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="910,128,87,125" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="140" minleveldifficulty="1">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
     </Price>
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Fabricate suitablefabricators="fabricator" requiredtime="45">
       <RequiredSkill identifier="electrical" level="20" />
       <RequiredItem identifier="uranium" />
@@ -97,13 +97,13 @@
   
   <Item name="" identifier="seedbag" category="Misc" Tags="smallitem" scale="0.5">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckcrewcab,abandonedcrewcab,piratecrewcab,outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" sourcerect="841,704,49,65" depth="0.55" origin="0.5,0.5" />
     <Body width="45" height="60" density="12" />
     <Price baseprice="60" minleveldifficulty="1">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -115,8 +115,8 @@
       <RequiredItem identifier="organicfiber" />
     </Deconstruct>
     <Holdable slots="RightHand+LeftHand,Any" msg="ItemMsgPickUpSelect" holdangle="40" handle1="0,10" />
-    <ItemContainer capacity="12" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="seed" />
+    <ItemContainer capacity="36" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="seed,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Gardening/growableplants.xml b/Content/Items/Gardening/growableplants.xml
index e2ef20b8..3cf7137d 100644
--- a/Content/Items/Gardening/growableplants.xml
+++ b/Content/Items/Gardening/growableplants.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- -->
-  <Item name="" identifier="creepingorangevineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
+  <Item name="" identifier="creepingorangevineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="255,54,0,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="830,636,31,30" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -49,14 +49,14 @@
     </Upgrade>
   </Item>
   
-  <Item name="" identifier="tobaccovineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
+  <Item name="" identifier="tobaccovineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="48,122,245,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,636,30,31" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -96,14 +96,14 @@
     </Upgrade>
   </Item>
   
-  <Item name="" identifier="saltvineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="" identifier="saltvineseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="829,666,33,35" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -143,14 +143,14 @@
     </Upgrade>
   </Item>
   
-  <Item name="" identifier="raptorbaneseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
+  <Item name="" identifier="raptorbaneseed" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="238,36,98,255">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="863,668,30,33" origin="0.5,0.5" />
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.3" />
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.6" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.2" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -192,17 +192,17 @@
   </Item>
 
 
-  <Item name="" identifier="banana" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
+  <Item name="" identifier="banana" category="Misc" Tags="smallitem,seed,plantitem" maxstacksize="60" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" spritecolor="215,245,77,255">
     <!-- TODO: sprite -->
     <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="263,193,38,39" depth="0.2" origin="0.5,0.5" />
-    <PreferredContainer primary="seedbag" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="seedbag" amount="2" spawnprobability="0.06" />
     <Price baseprice="50" canbespecial="false">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5" sold="true">
         <Reputation faction="clowns" min="50"/>
       </Price>
     </Price>
diff --git a/Content/Items/Gardening/plantproducts.xml b/Content/Items/Gardening/plantproducts.xml
index 5578e7ee..55261eef 100644
--- a/Content/Items/Gardening/plantproducts.xml
+++ b/Content/Items/Gardening/plantproducts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="creepingorange" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,649,43,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Price baseprice="20" sold="false">
@@ -32,7 +32,7 @@
     <PreferredContainer secondary="medfabcab,storagecab"/>
   </Item>
   
-  <Item name="" identifier="tobaccobud" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="tobaccobud" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,plantitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="904,646,56,61" origin="0.5,0.5" />
     <Body radius="30" density="9" waterdragcoefficient="20"/>
     <Price baseprice="40" sold="false">
@@ -61,7 +61,7 @@
     <PreferredContainer secondary="medfabcab,storagecab"/>
   </Item>
 
-  <Item name="" identifier="badraptorbane" descriptionidentifier="raptorbane" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="badraptorbane" descriptionidentifier="raptorbane" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="907,838,44,50" origin="0.5,0.5" />
     <Body radius="30" density="9"/>
     <Deconstruct time="35">
@@ -95,7 +95,7 @@
     <PreferredContainer secondary="storagecab"/>
   </Item>
   
-  <Item name="" identifier="saltbulb" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,explodesinwater" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="saltbulb" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,plantitem,explodesinwater" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="968,712,49,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Price baseprice="65" sold="false">
@@ -133,7 +133,7 @@
     <PreferredContainer secondary="storagecab"/>
   </Item>
 
-  <Item name="" identifier="raptorbane" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
+  <Item name="" identifier="raptorbane" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,plantitem,petfood1,petfood2,petfood3,distillable" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="8" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,777,44,50" origin="0.5,0.5" />
     <Body radius="30" density="9" waterdragcoefficient="10"/>
     <Price baseprice="40" sold="false">
@@ -163,7 +163,7 @@
     <PreferredContainer secondary="storagecab"/>
   </Item>
 
-  <Item name="" identifier="badcreepingorange" descriptionidentifier="creepingorange" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" allowasextracargo="true">
+  <Item name="" identifier="badcreepingorange" descriptionidentifier="creepingorange" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,plantitem,petfood1,petfood2,petfood3" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft" impacttolerance="5.5" allowasextracargo="true">
     <Sprite texture="Content/Items/Gardening/GrowablePlants_Temp.png" depth="0.2" sourcerect="971,835,43,55" origin="0.5,0.5" />
     <Body radius="30" density="9" />
     <Deconstruct time="35">
diff --git a/Content/Items/Genetic/genetic.xml b/Content/Items/Genetic/genetic.xml
index f07944b3..21dc3e17 100644
--- a/Content/Items/Genetic/genetic.xml
+++ b/Content/Items/Genetic/genetic.xml
@@ -3,7 +3,7 @@
   <Item name="" identifier="op_researchterminal" tags="geneticresearchstation" width="494" height="297" texturescale="1.0,1.0" scale="0.5" category="Machine">
     <sprite texture="Content/Map/Outposts/Art/MedicalItemResearch.png" sourcerect="417,6,494,297" depth="0.79" premultiplyalpha="false" origin="0.5,0.5" />
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="134,969,54,45" origin="0.5,0.45" />
-    <LightComponent range="0.0" powerconsumption="5" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="0" powerconsumption="5" lightcolor="255,255,255,111" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Map/Outposts/Art/MedicalItemResearchLights.png" sourcerect="417,6,494,297" depth="0.1" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
     <Deconstructor canbeselected="true" showoutput="false" powerconsumption="500.0" deconstructitemssimultaneously="true" msg="ItemMsgInteractSelect" activatebuttontext="researchstation.invalidinput" infotext="researchstation.empty.infotext" infoareawidth="0.7">
@@ -12,10 +12,10 @@
       <poweronsound file="Content/Items/PowerOnLight3.ogg" range="600" loop="false" />
       <StatusEffect type="InWater" target="This" condition="-0.5" />
     </Deconstructor>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true">
-      <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial" />
+    <ItemContainer capacity="6" maxstacksize="60" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true">
+      <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true">
+    <ItemContainer capacity="1" maxstacksize="60" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true">
       <Containable items="geneticmaterial,stabilozine,unidentifiedgeneticmaterial,researchmaterial,smallitem,mediumitem" />
     </ItemContainer>
     <Repairable selectkey="Action" header="electricalrepairsheader" deteriorationspeed="0.0" canbeselected="true" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairScrewdriver" hudpriority="10">
@@ -37,12 +37,12 @@
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="genesplicer" scale="0.4" category="Equipment" tags="smallitem,geneticdevice" description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab" secondary="medcab"/>
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.04"/>
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantcity" sold="false"/>
@@ -67,7 +67,7 @@
     <InventoryIcon texture="Content/Items/Genetic/Genetic.png" sourcerect="244,62,76,65" origin="0.5,0.5" />
     <Sprite name="Headset" texture="Content/Items/Genetic/Genetic.png" depth="0.6" sourcerect="67,85,73,35" origin="0.5,0.5" />
     <Body radius="15" width="45" density="25" />
-    <ItemContainer capacity="1" maxstacksize="1" autoinject="true" autoinjectthreshold="Infinity" allowswappingcontaineditems="false">
+    <ItemContainer capacity="1" maxstacksize="60" autoinject="true" autoinjectthreshold="Infinity" allowswappingcontaineditems="false">
       <Containable items="geneticmaterial" />
     </ItemContainer>
     <Wearable limbtype="Head" slots="Any,HealthInterface" msg="ItemMsgPickUpSelect" displaycontainedstatus="true">
@@ -76,14 +76,14 @@
   </Item>
   <Item name="" identifier="geneticmaterial_unresearched" nameidentifier="unidentifiedgeneticmaterial" 
         aliases="geneticmaterialcrawler_unresearched,geneticmaterialcrawler_unresearched2,geneticmaterialcrawler_unresearched3,geneticmaterialmudraptor_unresearched,geneticmaterialmudraptor_unresearched2,geneticmaterialmudraptor_unresearched3,geneticmaterialmoloch_unresearched,geneticmaterialmoloch_unresearched2,geneticmaterialmoloch_unresearched3,geneticmaterialmantis_unresearched,geneticmaterialmantis_unresearched2,geneticmaterialmantis_unresearched3,geneticmaterialthresher_unresearched,geneticmaterialthresher_unresearched2,geneticmaterialthresher_unresearched3,geneticmaterialhammerhead_unresearched,geneticmaterialhammerhead_unresearched2,geneticmaterialhammerhead_unresearched3,geneticmaterialhammerheadmatriarch_unresearched,geneticmaterialhammerheadmatriarch_unresearched2,geneticmaterialhammerheadmatriarch_unresearched3,geneticmaterialspineling_unresearched,geneticmaterialspineling_unresearched2,geneticmaterialspineling_unresearched3,geneticmaterialhusk_unresearched,geneticmaterialhusk_unresearched2,geneticmaterialhusk_unresearched3,geneticmaterialmollusc_unresearched,geneticmaterialmollusc_unresearched2,geneticmaterialmollusc_unresearched3,geneticmaterialskitter_unresearched,geneticmaterialskitter_unresearched2,geneticmaterialskitter_unresearched3,geneticmaterialhunter_unresearched,geneticmaterialhunter_unresearched2,geneticmaterialhunter_unresearched3" 
-        category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" tags="smallitem,unidentifiedgeneticmaterial,blackmarketgenes" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" hideinmenus="true">
+        category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" tags="smallitem,unidentifiedgeneticmaterial,blackmarketgenes" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" hideinmenus="true">
     <PreferredContainer primary="medfabcab" spawnprobability="0"/>
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.3"/>
-    <PreferredContainer secondary="geneticstorage" minamount="1" maxamount="2" spawnprobability="1.0" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="3" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab,researchcontainer" spawnprobability="0.6"/>
+    <PreferredContainer secondary="geneticstorage" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="4" maxamount="6" spawnprobability="0.4" />
     <Price baseprice="300" sold="false" requiresunlock="true">
-      <Price storeidentifier="merchantcity" sold="true" minavailable="5" maxavailable="10"/>
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="10" maxavailable="15" />
+      <Price storeidentifier="merchantcity" sold="true" minavailable="15" maxavailable="10"/>
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.2" minavailable="30" maxavailable="15" />
     </Price>
     <Deconstruct time="5" chooserandom="true" amount="1" requireddeconstructor="geneticresearchstation">
       <Item identifier="geneticmaterialcrawler" commonness="3" requiredotheritem="stabilozine" outconditionmin="0.1" outconditionmax="0.2" activatebuttontext="researchstation.research" infotext="researchstation.research.infotext" infotextonotheritemmissing="researchstation.combine.missingitem" />
@@ -127,7 +127,7 @@
     <Body width="15" radius="15" density="20" />
     <Pickable slots="Any" />
   </Item>
-  <Item name="" identifier="geneticmaterialcrawler" nameidentifier="geneticmaterial" category="Material" maxstacksize="1" tags="smallitem,geneticmaterial" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_metal_light" hideconditionbar="true" hideconditionintooltip="false" allowsellingwhenbroken="true">
+  <Item name="" identifier="geneticmaterialcrawler" nameidentifier="geneticmaterial" category="Material" maxstacksize="60" tags="smallitem,geneticmaterial" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_metal_light" hideconditionbar="true" hideconditionintooltip="false" allowsellingwhenbroken="true">
     <PreferredContainer primary="medfabcab" />
     <Price baseprice="750" sold="false">
       <Price storeidentifier="merchantcity"/>
@@ -223,7 +223,7 @@
       <Item identifier="geneticmaterialhusk" multiplier="5" />
     </Deconstruct>
     <Price>
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="70"/>
       </Price>
     </Price>
diff --git a/Content/Items/Jobgear/Assistant/assistant_gear.xml b/Content/Items/Jobgear/Assistant/assistant_gear.xml
index f2abaeb6..1ff562dd 100644
--- a/Content/Items/Jobgear/Assistant/assistant_gear.xml
+++ b/Content/Items/Jobgear/Assistant/assistant_gear.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <Item name="" identifier="assistantclothes" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
diff --git a/Content/Items/Jobgear/Assistant/assistant_talent_items.xml b/Content/Items/Jobgear/Assistant/assistant_talent_items.xml
index f9a8c10b..e5ed4d88 100644
--- a/Content/Items/Jobgear/Assistant/assistant_talent_items.xml
+++ b/Content/Items/Jobgear/Assistant/assistant_talent_items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="skillbooksailorsguide" category="Misc" cargocontaineridentifier="metalcrate" allowasextracargo="true" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbooksailorsguide" category="Misc" cargocontaineridentifier="metalcrate" allowasextracargo="true" Tags="smallitem,skillbook" maxstacksize="60" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" maxavailable="1" />
@@ -108,7 +108,7 @@
         <DropContainedItems/>
       </StatusEffect>
     </Holdable>
-    <ItemContainer capacity="2" maxstacksize="1" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" AllowAccessWhenDropped="false" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="6" maxstacksize="60" canbeselected="true" hideitems="false" itempos="92,-48" iteminterval="0,-92" AllowAccessWhenDropped="false" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <Containable items="crate" />
     </ItemContainer>
@@ -162,7 +162,7 @@
     </MeleeWeapon>
     <aitarget sightrange="500" soundrange="250" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="StrikingPowerMultiplier" value="0.15"/>
+      <QualityStat stattype="StrikingPowerMultiplier" value="0.45"/>
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
     <SkillRequirementHint identifier="helm" level="50" />
@@ -197,7 +197,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" showcontainedstateindicator="false" canbeselected="true">
       <GuiFrame relativesize="0.15,0.2" anchor="Center" style="ItemUI" />
       <StatusEffect type="OnBroken" target="This">
         <particleemitter particle="mudrapeggbrownchunks" particleamount="100" velocitymin="100" velocitymax="2000" anglemin="0" anglemax="360" scalemin="0.4" scalemax="0.6" />
@@ -211,7 +211,7 @@
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
       <StatusEffect type="Always" target="This" Condition="0" setvalue="true">
         <Conditional Scale="gte 0.5" />
-        <SpawnCharacter speciesname="Mudraptor_pet" totalmaxcount="2" inheritteam="true"/>
+        <SpawnCharacter speciesname="Mudraptor_pet" totalmaxcount="4" inheritteam="true"/>
         <Remove />
       </StatusEffect>
       <Containable items="antibloodloss1">
@@ -220,10 +220,10 @@
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
       </Containable>
     </ItemContainer>
-    <LightComponent range="5" lightcolor="255,255,255,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
+    <LightComponent range="20" lightcolor="255,255,255,61" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulsefrequency="1" pulseamount="0.30">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="300,291,98,113" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="40" lightcolor="255,255,255,70" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
+    <LightComponent range="160" lightcolor="255,255,255,70" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/CreatureLoot/CreatureLoot.png" depth="0.025" sourcerect="410,301,88,95" origin="0.5,0.6" alpha="1.0" />
     </LightComponent>
   </Item>
diff --git a/Content/Items/Jobgear/Captain/captain_gear.xml b/Content/Items/Jobgear/Captain/captain_gear.xml
index 38d2d311..e88746fd 100644
--- a/Content/Items/Jobgear/Captain/captain_gear.xml
+++ b/Content/Items/Jobgear/Captain/captain_gear.xml
@@ -2,13 +2,13 @@
 <Items>
   <!-- HATS START -->
   <Item name="" identifier="captainscap1" aliases="captainscap" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 1" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="12,130,89,50" origin="0.5,0.5" />
@@ -20,13 +20,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainscap2" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 2" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="114,129,83,48" origin="0.5,0.5" />
@@ -38,13 +38,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainscap3" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 3" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="212,119,90,53" origin="0.5,0.5" />
@@ -56,13 +56,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainsseparatistcap1" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 1" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="314,115,89,59" origin="0.5,0.5" />
@@ -74,13 +74,13 @@
     </Wearable>
   </Item>
   <Item name="" identifier="captainsseparatistcap2" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer primary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true"/>
     <Price baseprice="75" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10" />
     <Sprite name="Captain's Cap 2" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="424,125,79,38" origin="0.5,0.5" />
@@ -96,11 +96,11 @@
   <Item name="" identifier="captainsuniform1" aliases="captainsuniform" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -130,11 +130,11 @@
   <Item name="" identifier="captainsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -164,11 +164,11 @@
   <Item name="" identifier="captainsuniform3" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -198,11 +198,11 @@
   <Item name="" identifier="captainseparatistsuniform1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -232,11 +232,11 @@
   <Item name="" identifier="captainseparatistsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -266,11 +266,11 @@
   <Item name="" identifier="captainseparatistsuniform3" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
diff --git a/Content/Items/Jobgear/Captain/captain_talent_items.xml b/Content/Items/Jobgear/Captain/captain_talent_items.xml
index 3e77a424..3c822d78 100644
--- a/Content/Items/Jobgear/Captain/captain_talent_items.xml
+++ b/Content/Items/Jobgear/Captain/captain_talent_items.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="handcannonround" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" Scale="0.5" tags="smallitem,handcannonammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="handcannonround" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" Scale="0.5" tags="smallitem,handcannonammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer primary="handcannon" amount="6" spawnprobability="1.0"/>
-    <PreferredContainer secondary="wrecksecarmcab" minamount="1" maxamount="6" spawnprobability="0.02"/>    
+    <PreferredContainer primary="handcannon" amount="12" spawnprobability="1"/>
+    <PreferredContainer secondary="wrecksecarmcab" minamount="2" maxamount="12" spawnprobability="0.04"/>    
     <Price baseprice="50" sold="false" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="45" />
@@ -73,21 +73,21 @@
       <RequiredItems items="handcannonammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="60" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="0" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="0" containedspritedepth="0.56">
       <Containable items="handcannonammo" hide="true"/>
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="17,4" setactive="true"/>
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="60" />
   </Item>
-  <Item name="" identifier="coalitioncommendation" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="coalitioncommendation" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="300" buyingpricemodifier="5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" maxavailable="0" />
@@ -109,14 +109,14 @@
       <StatusEffect type="OnUse" target="This" Condition="-100.0" disabledeltatime="true" />
       <StatusEffect type="OnUse" target="UseTarget" disabledeltatime="true">
         <Sound file="Content/Items/Button/button.ogg" type="OnUse" range="500" />
-        <GiveExperience amount="275" />
+        <GiveExperience amount="17600" />
       </StatusEffect>
       <StatusEffect type="OnBroken" target="This">
         <Remove />
       </StatusEffect>
     </MeleeWeapon>
   </Item>
-  <Item name="" identifier="coalitionmedal" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="coalitionmedal" category="Misc" Tags="smallitem" cargocontaineridentifier="metalcrate" allowasextracargo="true" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="600" buyingpricemodifier="5" minleveldifficulty="65">
       <Price storeidentifier="merchantoutpost" maxavailable="0" />
@@ -139,7 +139,7 @@
       <StatusEffect type="OnUse" target="This" Condition="-100.0" disabledeltatime="true" />
       <StatusEffect type="OnUse" target="UseTarget" disabledeltatime="true">
         <Sound file="Content/Items/Button/button.ogg" type="OnUse" range="500" />
-        <GiveExperience amount="550" />
+        <GiveExperience amount="35200" />
       </StatusEffect>
       <StatusEffect type="OnBroken" target="This">
         <Remove />
@@ -179,10 +179,10 @@
     </Holdable>
   </Item>
 
-  <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.01" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="1" spawnprobability="0.01" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.02" notcampaign="true"/>
+  <Rum name="" identifier="rum" category="Medical,Misc" maxstacksize="60" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.04" notcampaign="true"/>
     <PreferredContainer primary="medfabcab" secondary="medcab"/>
     <Price baseprice="130" sold="false">
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="3" sold="true">
diff --git a/Content/Items/Jobgear/Clown/clown.xml b/Content/Items/Jobgear/Clown/clown.xml
index f4ecae14..253a7ff0 100644
--- a/Content/Items/Jobgear/Clown/clown.xml
+++ b/Content/Items/Jobgear/Clown/clown.xml
@@ -2,16 +2,16 @@
 <Items>
   <Item name="" identifier="clownmask" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clownmask,clowns" description="" scale="0.5">
     <Price baseprice="40" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.04" />
     <PreferredContainer primary="crewcab"/>
     <Sprite name="Clown Mask" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="414,318,89,71" origin="0.5,0.5" scale="0.5" />
     <Body width="40" radius="30" density="15" />
@@ -25,16 +25,16 @@
   </Item>
   <Item name="" identifier="clowncostume" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,clowngear,clowns" description="" impactsoundtag="impact_soft" scale="0.5">
     <Price baseprice="40" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.02" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.04" />
     <PreferredContainer primary="crewcab"/>
     <InventoryIcon name="Clown Costume Icon" texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
     <Sprite name="Clown Costume" texture="Content/Items/Jobgear/MiscJobGear.png" sourcerect="247,14,117,55" depth="0.6" origin="0.5,0.5" />
@@ -72,7 +72,7 @@
         <Reputation faction="clowns" min="90"/>
       </Price>
     </Price>
-    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.01" />
+    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.02" />
     <PreferredContainer primary="crewcab"/>
     <Sprite name="Clown Mask" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="414,417,89,71" origin="0.5,0.5" scale="0.5" />
     <Body width="40" radius="30" density="15" />
@@ -87,7 +87,7 @@
   </Item>
   <Item name="" identifier="clownsuitunique" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing,clowngear,clowns" description="" impactsoundtag="impact_soft" hideinmenus="true" scale="0.5">
     <Price baseprice="40" sold="false" canbespecial="false" />
-    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.01" />
+    <PreferredContainer primary="wreckstoragecab" spawnprobability="0.02" />
     <PreferredContainer primary="crewcab"/>
     <InventoryIcon name="Clown Costume Icon" texture="Content/Items/InventoryIconAtlas2.png" sourcerect="320,384,64,64" origin="0.5,0.5" />
     <Sprite name="Clown Costume" texture="Content/Items/Jobgear/MiscJobGear.png" sourcerect="769,74,118,72" depth="0.6" origin="0.5,0.5" />
@@ -125,11 +125,11 @@
   </Item>
   
   <Item name="" identifier="cymbals" category="Misc" tags="smallitem,clowns,provocativetohumanai" scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="crewcab" spawnprobability="0.01" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.01"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.02" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.02"/>
     <PreferredContainer secondary="locker"/>
     <Price baseprice="100" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" sold="true">
         <Reputation faction="clowns" min="70"/>
       </Price>
     </Price>
@@ -150,12 +150,12 @@
     <aitarget soundrange="3000" fadeouttime="5" />
   </Item>
 
-  <Item name="" identifier="bananapeel" category="Misc" maxstacksize="8" cargocontaineridentifier="metalcrate" tags="smallitem,clowns" Scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="crewcab" spawnprobability="0.01" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.01"/>
+  <Item name="" identifier="bananapeel" category="Misc" maxstacksize="60" cargocontaineridentifier="metalcrate" tags="smallitem,clowns" Scale="0.5" impactsoundtag="impact_soft">
+    <PreferredContainer primary="crewcab" spawnprobability="0.02" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.02"/>
     <PreferredContainer secondary="locker"/>
     <Price baseprice="30" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
@@ -226,8 +226,8 @@
     <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="5,0,158,83" depth="0.54" origin="0.5,0.5" />
     <Body width="150" height="76" density="20" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-20,14" handle2="20,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="12" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem" excludeditems="toolbox,cargoscooter" />
+    <ItemContainer capacity="36" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Controller UserPos="0,-20" direction="Right" canbeselected="true" AllowSelectingWhenSelectedByOther="false" selectkey="Use" drawuserbehind="true" forceusertostayattached="true" msg="itemmsggoinside">
       <limbposition limb="Head" position="74,-40" />
@@ -244,15 +244,15 @@
   </Item>
 
   <Item name="" identifier="bikehorn" category="Misc" tags="smallitem,hornitem,clowns,provocativetohumanai" scale="0.5" cargocontaineridentifier="metalcrate" description="HONK">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.05"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
     <Price baseprice="5" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantclown" minavailable="9" maxavailable="5">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
@@ -269,14 +269,14 @@
   
   <Item name="" identifier="toyhammer" category="Weapon" Tags="smallitem,mountableweapon,clowns" Scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="crewcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" spawnprobability="0.06"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" spawnprobability="0.12"/>
     <Price baseprice="80" sold="false" canbespecial="false">
-      <Price storeidentifier="merchantoutpost" sold="true" minavailable="1"/>
-      <Price storeidentifier="merchantcity" sold="true" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" sold="true" minavailable="3"/>
+      <Price storeidentifier="merchantcity" sold="true" minavailable="3"/>
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="0.9" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="50"/>
       </Price>
     </Price>
@@ -314,7 +314,7 @@
   </Item>
   <Item name="" identifier="honkmotherianscriptures1" category="Misc" hideinmenus="true" Tags="smallitem,clowns" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="2" maxavailable="3" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="6" maxavailable="3" sold="true">
         <Reputation faction="clowns" min="30"/>
       </Price>
     </Price>
@@ -331,7 +331,7 @@
   </Item>
   <Item name="" identifier="honkmotherianscriptures2" variantof="honkmotherianscriptures1">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="40"/>
       </Price>
     </Price>
@@ -342,7 +342,7 @@
   </Item>
   <Item name="" identifier="honkmotherianscriptures3" variantof="honkmotherianscriptures1">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchantclown" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantclown" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="clowns" min="50"/>
       </Price>
     </Price>
@@ -377,7 +377,7 @@
     <Wearable slots="OuterClothes+RightHand" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select" allowusewhenworn="true">
       <sprite name="Clown Exosuit Helmet Wearable" texture="Content/Items/JobGear/Clown/ClownExosuit.png" limb="Head" hidelimb="true" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hideotherwearables="true" hidewearablesoftype="" sourcerect="0,0,1,1" origin="0.5,0.5"/>
       <sprite name="Clown Exosuit Torso" texture="Content/Items/JobGear/Clown/ClownExosuit.png" limb="Torso" hidelimb="true" inherittexturescale="true" hideotherwearables="true" inheritorigin="false" origin="0.5,0.7" inheritlimbdepth="false" depth="0.061" inheritsourcerect="false" sourcerect="167,1,203,193">
-        <LightComponent range="100" lightcolor="250,224,165,100" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="400" lightcolor="250,224,165,100" castshadows="false" depth="0.6" powerconsumption="10" IsOn="true" allowingameediting="false">
           <Sprite texture="Content/Items/JobGear/Clown/ClownExosuit.png" origin="0.5,0.7" sourcerect="304,271,203,193" alpha="1.0" />
         </LightComponent>
       </sprite>
@@ -436,8 +436,8 @@
       <StatusEffect type="OnUse" target="This" reload="0.1" setvalue="true" delay="5.0" />
       <RequiredItems items="bananapeelprojectile" type="Contained" />
     </RangedWeapon>
-    <ItemContainer capacity="0" maxstacksize="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
-      <Containable items="none" />
+    <ItemContainer capacity="0" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0">
+      <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <StatusEffect type="OnWearing" target="Contained" playsoundonrequireditemfailure="true">
@@ -445,7 +445,7 @@
         <Conditional condition="lte 0.0" />
         <Sound file="Content/Items/WarningBeep.ogg" range="500" loop="true"/>
       </StatusEffect>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="oxygensource,weldingtoolfuel" />
         <Containable items="oxygensource">
           <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
@@ -492,7 +492,7 @@
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="divingsuitfuel">
           <StatusEffect type="OnContaining" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
@@ -500,7 +500,7 @@
         </Containable>
       </SubContainer>
     </ItemContainer>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" spawnwithid="bananapeelprojectile">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" spawnwithid="bananapeelprojectile">
       <Containable items="bananapeelprojectile" />
     </ItemContainer>
     <CustomInterface canbeselected="false" drawhudwhenequipped="true" allowuioverlap="true">
diff --git a/Content/Items/Jobgear/Commoner/commoner_gear.xml b/Content/Items/Jobgear/Commoner/commoner_gear.xml
index 9bd626c9..f148d4ff 100644
--- a/Content/Items/Jobgear/Commoner/commoner_gear.xml
+++ b/Content/Items/Jobgear/Commoner/commoner_gear.xml
@@ -2,15 +2,15 @@
 <Items>
   <!-- UNIFORMS START -->
   <Item name="" identifier="commonerclothes1" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -37,15 +37,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes2" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -72,15 +72,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes3" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -107,15 +107,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes4" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -142,15 +142,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="commonerclothes5" nameidentifier="outpostoutfit1" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -177,15 +177,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="crewchiefclothes" nameidentifier="crewchiefoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -213,15 +213,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="medicalofficerclothes" nameidentifier="medicalofficeroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -248,15 +248,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="minerclothes" nameidentifier="mineroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -285,15 +285,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="quartermasterclothes" nameidentifier="quartermasteroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -321,15 +321,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="researcherclothes" nameidentifier="researcheroutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -359,15 +359,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="securitypatrolclothes" nameidentifier="securitypatroloutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -395,15 +395,15 @@
     </Wearable>
   </Item>
   <Item name="" identifier="administratorclothes" nameidentifier="stationadminoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -430,7 +430,7 @@
     </Wearable>
   </Item>
   <Item name="" identifier="banditclothes1" nameidentifier="banditoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" />
@@ -465,7 +465,7 @@
     </Wearable>
   </Item>
   <Item name="" identifier="banditclothes2" nameidentifier="banditoutfit" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.2" />
+    <PreferredContainer primary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" />
diff --git a/Content/Items/Jobgear/Cultist/cultist_gear.xml b/Content/Items/Jobgear/Cultist/cultist_gear.xml
index 50a11e09..5b715f6c 100644
--- a/Content/Items/Jobgear/Cultist/cultist_gear.xml
+++ b/Content/Items/Jobgear/Cultist/cultist_gear.xml
@@ -3,7 +3,7 @@
   <Item name="" identifier="cultistrobes" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="150" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="50"/>
       </Price>
     </Price>
@@ -38,7 +38,7 @@
   <Item name="" identifier="zealotrobes" category="Equipment" tags="smallitem,clothing,huskcult" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="550" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="90"/>
       </Price>
     </Price>
@@ -76,10 +76,10 @@
       </StatusEffect>
     </Wearable>
   </Item>
-  <Item name="" identifier="rituallantern" category="Equipment" maxstacksize="12" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,huskcult" impactsoundtag="impact_soft" isshootable="true">
+  <Item name="" identifier="rituallantern" category="Equipment" maxstacksize="60" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,huskcult" impactsoundtag="impact_soft" isshootable="true">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="100" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="4" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="4" sold="true">
         <Reputation faction="huskcult" min="70"/>
       </Price>
     </Price>
@@ -88,7 +88,7 @@
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="218,137,41,54" depth="0.55" origin="0.5,0.5" />
     <Body width="40" height="50" density="12" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="70,-70" handle1="-5,10" holdangle="0" throwforce="4.0" aimpos="30,-30" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="219,100,239,80" Flicker="0.2" pulsefrequency="0.2" pulseamount="0.5" range="600" IsOn="false">
+    <LightComponent LightColor="219,100,239,80" Flicker="0.2" pulsefrequency="0.2" pulseamount="0.5" range="2400" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" />
       <StatusEffect type="OnActive" targettype="This" Condition="-0.25" />
       <StatusEffect type="OnActive" targettype="This">
@@ -118,7 +118,7 @@
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="179,83,57,50" depth="0.55" origin="0.5,0.5" />
     <Price baseprice="370" sold="false"/>
     <Price baseprice="300" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="60"/>
       </Price>
     </Price>
@@ -131,7 +131,7 @@
   </Item>
   <Item name="" identifier="bookofchalices1" category="Misc" hideinmenus="true" Tags="smallitem,huskcult" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <Price baseprice="20" canbespecial="false" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="30"/>
       </Price>
     </Price>
diff --git a/Content/Items/Jobgear/Engineer/engineer_gear.xml b/Content/Items/Jobgear/Engineer/engineer_gear.xml
index 20855ef3..c110ff3b 100644
--- a/Content/Items/Jobgear/Engineer/engineer_gear.xml
+++ b/Content/Items/Jobgear/Engineer/engineer_gear.xml
@@ -2,13 +2,13 @@
 <Items>
   <Item name="" identifier="orangejumpsuit1" aliases="orangejumpsuit" category="Equipment" tags="smallitem,clothing,radiationproof" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -37,13 +37,13 @@
   </Item>
   <Item name="" identifier="orangejumpsuit2" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
     <Price baseprice="150" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -74,11 +74,11 @@
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -109,11 +109,11 @@
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
     <Price baseprice="150" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
diff --git a/Content/Items/Jobgear/Engineer/engineer_talent_items.xml b/Content/Items/Jobgear/Engineer/engineer_talent_items.xml
index 05f952b5..3612207d 100644
--- a/Content/Items/Jobgear/Engineer/engineer_talent_items.xml
+++ b/Content/Items/Jobgear/Engineer/engineer_talent_items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="depletedfuel" category="Fuel,Material" maxstacksize="8"  Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="depletedfuel" category="Fuel,Material" maxstacksize="60"  Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="reactorcab"/>    
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
@@ -116,7 +116,7 @@
     </Projectile>
   </Item>
   <Item name="" identifier="wrenchhardened" variantof="wrench" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" addedrepairspeedmultiplier="0.4">
-    <Preferredcontainer secondary="respawncontainer" amount="1"  spawnprobability="0" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2"  spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab"  spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab"  spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,pirateengcab,outpostengcab,beaconengcab"  spawnprobability="0"/>
@@ -146,7 +146,7 @@
     </MeleeWeapon>
   </Item>
   <Item name="" identifier="crowbarhardened" variantof="crowbar" allowasextracargo="true" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" addedpickingspeedmultiplier="0.6">
-    <PreferredContainer secondary="respawncontainer" amount="1" spawnprobability="0" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer" amount="2" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab" spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" spawnprobability="0" />
@@ -361,7 +361,7 @@
     <RemoteController target="reactor" onlyinownsub="true" msg="ItemMsgInteractSelect" AllowInGameEditing="false" drawhudwhenequipped="true" />
   </Item>
 
-  <Item name="" identifier="skillbookhandyseaman" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbookhandyseaman" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="60" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" maxavailable="1" />
@@ -392,7 +392,7 @@
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="coalition" min="70"/>
       </Price>
       <Price storeidentifier="merchantmine" multiplier="1.25" />
@@ -438,17 +438,17 @@
       <RequiredSkill identifier="weapons" level="25" />
       <RequiredSkill identifier="electrical" level="45" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="10,-5" containedspritedepths="0.562,0.561" containedstateindicatorstyle="default" containedstateindicatorslot="0">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="10,-5" containedspritedepths="0.562,0.561" containedstateindicatorstyle="default" containedstateindicatorslot="0">
       <Containable items="reactorfuel" rotation="90"/>
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="25,0" setactive="true"/>
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="25" />
     <SkillRequirementHint identifier="electrical" level="45" />
@@ -512,7 +512,7 @@
     <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.55" sourcerect="295,195,149,105" origin="0.5,0.5" />
     <Body width="140" height="100" density="10" />
     <Holdable slots="RightHand+LeftHand" aimpos="90,0" handle1="-35,32" handle2="-27,34" msg="ItemMsgPickUpSelect" holdangle="-10">
-      <LightComponent LightColor="220,255,150,200" range="500" powerconsumption="10" IsOn="true">
+      <LightComponent LightColor="220,255,150,200" range="2000" powerconsumption="10" IsOn="true">
         <Upgrade gameversion="1.1.2.0" powerconsumption="10" />
         <LightTexture texture="Content/Lights/lightcone.png" origin="-0.01, 0.5" size="1.0,1.0" />
       </LightComponent>
@@ -523,18 +523,18 @@
       <!-- Battery drain when using the light, adds up with propulsion -->
       <StatusEffect type="OnSecondaryUse" target="Contained" targetslot="0" Condition="-0.05" />
     </Holdable>
-    <Propulsion force="150" usablein="water" particles="bubbles">
+    <Propulsion force="450" usablein="water" particles="bubbles">
       <RequiredItems items="mobilebattery" targetslot="0" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" target="Contained" targetslot="0" Condition="-0.2">
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
       <sound file="Content/Items/Diving/ScooterLoop.ogg" type="OnUse" range="500.0" loop="true" />
     </Propulsion>
-    <ItemContainer capacity="1" maxstacksize="1" slotsperrow="3" hideitems="true" containedstateindicatorslot="0" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" slotsperrow="3" hideitems="true" containedstateindicatorslot="0" containedstateindicatorstyle="battery">
       <Containable items="mobilebattery" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="11" maxstacksize="32">
-        <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+      <SubContainer capacity="33" maxstacksize="60">
+        <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       </SubContainer>
     </ItemContainer>
     <AiTarget soundrange="3000" maxsightrange="3000" />
@@ -567,7 +567,7 @@
     </MiniMap>
   </Item>
   <Item name="" identifier="pucs" category="Equipment,Diving" tags="diving,deepdiving,divinggear_wearableindoors,human" allowasextracargo="true" scale="0.5" fireproof="true" description="" allowdroppingonswapwith="diving" impactsoundtag="impact_metal_heavy" botpriority="5" cargocontaineridentifier="">
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0" />    
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0" />    
     <Price baseprice="670" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" minavailable="0" maxavailable="3" sold="true">
@@ -598,7 +598,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="PUCS Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="127,520,105,124" origin="0.57,0.38">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" Interval="0.1" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -671,12 +671,12 @@
       </ItemComponent>
     </Wearable>
     <Holdable slots="RightHand+LeftHand" controlpose="true" holdpos="0,-50" handle1="-10,-20" handle2="10,-20" holdangle="45" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" />
-    <ItemContainer capacity="0" maxstacksize="0" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0" autoinject="true">
-      <Containable items="none" />
+    <ItemContainer capacity="0" maxstacksize="60" hideitems="true" containedstateindicatorstyle="tank" containedstateindicatorslot="0" autoinject="true">
+      <Containable items="none,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
-        <Containable items="oxygensource,weldingtoolfuel" excludeditems="oxygenitetank" />
+      <SubContainer capacity="1" maxstacksize="60">
+        <Containable items="oxygensource,weldingtoolfuel" />
         <Containable items="oxygenitetank">
           <StatusEffect type="OnWearing" target="Character" SpeedMultiplier="1.2" setvalue="true" comparison="And" targetslot="0">
             <Conditional IsDead="false" />
@@ -711,13 +711,13 @@
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="chem,syringe" />
       </SubContainer>
     </ItemContainer>
     <aitarget maxsightrange="1500" />
   </Item>
-  <Item name="" identifier="fulguriumfuelrodvolatile" category="Fuel" Tags="smallitem,reactorfuel" maxstacksize="8" allowasextracargo="true" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
+  <Item name="" identifier="fulguriumfuelrodvolatile" category="Fuel" Tags="smallitem,reactorfuel" maxstacksize="60" allowasextracargo="true" cargocontaineridentifier="metalcrate" health="400" scale="0.5">
     <PreferredContainer primary="reactorcab"/>
     <Price baseprice="400" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
@@ -748,7 +748,7 @@
     <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="67,176,62,61" origin="0.5,0.5" />
     <Sprite texture="Content/Items/JobGear/TalentGear.png" depth="0.55" sourcerect="190,60,20,71" origin="0.5,0.5" />
     <Body radius="6" height="55" density="30" />
-    <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="300.0" ison="true" />
+    <LightComponent allowingameediting="false" lightcolor="60,200,150,150" canbeselected="false" range="1200" ison="true" />
     <Holdable handle1="0,0" slots="Any,RightHand,LeftHand" msg="ItemMsgPickUpSelect">
       <StatusEffect type="Always" target="NearbyCharacters" range="125" interval="1" disabledeltatime="true">
         <Affliction identifier="radiationsickness" strength="1" />
@@ -761,7 +761,7 @@
       </StatusEffect>
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1" />
+      <QualityStat stattype="Condition" value="0.3" />
     </Quality>
   </Item>
 
@@ -810,7 +810,7 @@
     <Wearable slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select">
       <sprite name="Arc Emitter Worn" texture="Content/Items/JobGear/TalentGear.png" canbehiddenbyotherwearables="false" rotation="90" inheritlimbdepth="false" depth="0.6" sourcerect="207,430,131,61" limb="Torso" scale="0.5" origin="0.5,0.9" />
     </Wearable>
-    <ItemContainer itemrotation="90" capacity="1" maxstacksize="1" hideitems="false" itempos="10,-5" containedspritedepth="0.56" containedstateindicatorstyle="battery">
+    <ItemContainer itemrotation="90" capacity="1" maxstacksize="60" hideitems="false" itempos="10,-5" containedspritedepth="0.56" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
diff --git a/Content/Items/Jobgear/Mechanic/mechanic_gear.xml b/Content/Items/Jobgear/Mechanic/mechanic_gear.xml
index f3617795..680b7c26 100644
--- a/Content/Items/Jobgear/Mechanic/mechanic_gear.xml
+++ b/Content/Items/Jobgear/Mechanic/mechanic_gear.xml
@@ -3,13 +3,13 @@
   <!-- UNIFORMS START-->
   <Item name="" identifier="bluejumpsuit1" aliases="bluejumpsuit" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -39,13 +39,13 @@
   </Item>
   <Item name="" identifier="bluejumpsuit2" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -76,12 +76,12 @@
   <Item name="" identifier="mechanicseparatistsuniform1" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -112,12 +112,12 @@
   <Item name="" identifier="mechanicseparatistsuniform2" category="Equipment" tags="smallitem,clothing" fireproof="true" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -147,15 +147,15 @@
   </Item>
   <!-- UNIFORMS END -->
   <Item name="" identifier="baseballcap" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" scale="0.4">
-    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1" />
-    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.02" />
+    <PreferredContainer primary="crewcab" spawnprobability="0.2" notcampaign="true"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="wreckcrewcab" spawnprobability="0.04" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" minavailable="2" />
-      <Price storeidentifier="merchantmine" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="9" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" minavailable="6" />
+      <Price storeidentifier="merchantmine" minavailable="6" />
     </Price>
     <Deconstruct time="5" />
     <Sprite name="Baseball Cap" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="320,327,88,51" origin="0.5,0.5" />
diff --git a/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml b/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml
index b5ce205e..0df43cb6 100644
--- a/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml
+++ b/Content/Items/Jobgear/Mechanic/mechanic_talent_items.xml
@@ -50,7 +50,7 @@
     </Holdable>
     <aitarget sightrange="500" soundrange="500" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="RepairSpeed" value="0.1"/>
+      <QualityStat stattype="RepairSpeed" value="0.3"/>
     </Quality>
   </Item>
   <Item name="" identifier="portablepump" tags="smallitem,donttakeitems" category="Machine" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2" allowasextracargo="true" impactsoundtag="impact_metal_heavy" isshootable="true">
@@ -112,7 +112,7 @@
     <Holdable selectkey="Select" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" PickingTime="20.0" aimpos="65,-10" handle1="0,0" attachable="true" aimable="true" limitedattachable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="entityname.portablepump">
+    <ItemContainer capacity="1" maxstacksize="60" canbeselected="true" hideitems="true" hudpos="0.5,0.6" uilabel="entityname.portablepump">
       <GuiFrame relativesize="0.2,0.2" anchor="Center" relativeoffset="0,0.2" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
@@ -158,7 +158,7 @@
     </Wearable>
   </Item>
   <Item name="" identifier="wrenchdementonite" descriptionidentifier="dementonitetool" variantof="wrench" allowasextracargo="true" inventoryiconcolor="136,142,166,255" spritecolor="136,142,166" addedrepairspeedmultiplier="0.4">
-    <Preferredcontainer secondary="respawncontainer" amount="1"  spawnprobability="0" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2"  spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab"  spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab"  spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab"  spawnprobability="0"/>
@@ -189,7 +189,7 @@
     </MeleeWeapon>
   </Item>
   <Item name="" identifier="crowbardementonite" descriptionidentifier="dementonitetool" variantof="crowbar" allowasextracargo="true" inventoryiconcolor="136,142,166,255" spritecolor="136,142,166" addedpickingspeedmultiplier="0.6">
-    <PreferredContainer secondary="respawncontainer" amount="1" spawnprobability="0" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer" amount="2" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab" spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" spawnprobability="0" />
@@ -272,7 +272,7 @@
       </StatusEffect>
     </MeleeWeapon>
   </Item>
-  <Item name="" identifier="fixfoamgrenade" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" allowasextracargo="true" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fixfoamgrenade" category="Equipment" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" allowasextracargo="true" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab" secondary="locker"/>
     <Price baseprice="95" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -336,11 +336,11 @@
       </StatusEffect>
     </ItemComponent>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.2" />
+      <QualityStat stattype="ExplosionRadius" value="0.6" />
     </Quality>
   </Item>
   <Item name="" identifier="heavywrench" variantof="wrench" addedrepairspeedmultiplier="0.4">
-    <Preferredcontainer secondary="respawncontainer" amount="1"  spawnprobability="0" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2"  spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="engcab"  spawnprobability="0"/>
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab"  spawnprobability="0" />
     <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab"  spawnprobability="0"/>
@@ -386,7 +386,7 @@
   </Item>
   <Item name="" identifier="makeshiftarmor" category="Equipment" tags="smallitem,clothing" scale="0.5" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="secarmcab" amount="0" notcampaign="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.02" />
     <Price baseprice="140" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
@@ -433,7 +433,7 @@
   </Item>
   <Item name="" identifier="ironhelmet" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
     <PreferredContainer primary="secarmcab" amount="0" notcampaign="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.02" />
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="50" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
@@ -481,7 +481,7 @@
     <Wearable slots="OuterClothes" msg="ItemMsgEquipSelect" displaycontainedstatus="true" canbeselected="false" canbepicked="true" pickkey="Select" allowusewhenworn="true">
       <sprite name="Exosuit Helmet Wearable" texture="Content/Items/Jobgear/Mechanic/Exosuit.png" limb="Head" hidelimb="true" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hideotherwearables="true" hidewearablesoftype="" sourcerect="0,0,1,1" origin="0.5,0.5" />
       <sprite name="Exosuit Torso" texture="Content/Items/Jobgear/Mechanic/Exosuit.png" limb="Torso" scale="1.2" hidelimb="true" inherittexturescale="true" hideotherwearables="true" inheritorigin="false" origin="0.5,0.8" inheritlimbdepth="true" inheritsourcerect="false" sourcerect="167,1,203,193">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false" offset="-50,-50">
           <LightTexture texture="Content/Lights/divinghelmetlight.png" origin="0.05, 0.5" size="1.0,1.0" />          
         </LightComponent>
       </sprite>
@@ -536,7 +536,7 @@
         <Conditional condition="lte 0.0" />
         <Sound file="Content/Items/WarningBeep.ogg" range="500" loop="true"/>
       </StatusEffect>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="oxygensource,weldingtoolfuel" />
         <Containable items="oxygensource">
           <StatusEffect type="OnWearing" target="Character" OxygenAvailable="1000.0" />
@@ -583,15 +583,15 @@
           </StatusEffect>
         </Containable> 
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="divingsuitfuel">
           <StatusEffect type="OnContaining" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
         </Containable>
       </SubContainer>
-      <SubContainer capacity="10" maxstacksize="32">
-        <Containable items="smallitem" />
+      <SubContainer capacity="30" maxstacksize="60">
+        <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       </SubContainer>
     </ItemContainer>
     <aitarget maxsightrange="1500" />
@@ -604,7 +604,7 @@
       <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="0" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="separatists" min="70"/>
       </Price>
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
@@ -646,16 +646,16 @@
       <RequiredSkill identifier="weapons" level="25" />
       <RequiredSkill identifier="mechanical" level="45" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="32" slotsperrow="3" hideitems="true" containedstateindicatorslot="1" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" slotsperrow="3" hideitems="true" containedstateindicatorslot="1" containedstateindicatorstyle="battery">
       <Containable items="scrapcannonammo" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1"  maxstacksize="1">
+      <SubContainer capacity="1"  maxstacksize="60">
         <Containable items="mobilebattery" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="25" />
     <SkillRequirementHint identifier="mechanical" level="45" />
@@ -681,7 +681,7 @@
     <Pickable slots="Any">
       <StatusEffect type="OnSpawn" targettype="This" delay="0.2">
         <RemoveItem />
-        <SpawnCharacter speciesname="Defensebot" totalmaxcount="2" inheritteam="true"/>
+        <SpawnCharacter speciesname="Defensebot" totalmaxcount="4" inheritteam="true"/>
       </StatusEffect>
     </Pickable>
   </Item>
@@ -692,7 +692,7 @@
     <Pickable slots="Any">
       <StatusEffect type="Always" targettype="This">
         <RemoveItem />
-        <SpawnCharacter speciesname="Defensebot" totalmaxcount="2" inheritteam="true"/>
+        <SpawnCharacter speciesname="Defensebot" totalmaxcount="4" inheritteam="true"/>
       </StatusEffect>
     </Pickable>
   </Item>
@@ -720,7 +720,7 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="defensebotammobox" maxstacksize="1" scale="0.3" category="Weapons,Machine" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,defensebotammo" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="defensebotammobox" maxstacksize="60" scale="0.3" category="Weapons,Machine" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,defensebotammo" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="defensebot,secarmcab" secondary="armcab"/>
     <Price baseprice="200" displaynonempty="true" sold="false">
       <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="0" maxavailable="2"/>
diff --git a/Content/Items/Jobgear/Medic/medic_gear.xml b/Content/Items/Jobgear/Medic/medic_gear.xml
index 76f3f4c2..e4989398 100644
--- a/Content/Items/Jobgear/Medic/medic_gear.xml
+++ b/Content/Items/Jobgear/Medic/medic_gear.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <Item name="" identifier="healthscanner" scale="0.5" category="Equipment" tags="smallitem" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="medcab" amount="1" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab" spawnprobability="0.03"/>
-    <Price baseprice="150" minavailable="1">
+    <PreferredContainer primary="medcab" amount="2" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab" spawnprobability="0.06"/>
+    <Price baseprice="150" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" minavailable="8" />
+      <Price storeidentifier="merchantresearch" minavailable="24" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantmedical" minavailable="8" />
+      <Price storeidentifier="merchantmedical" minavailable="24" />
     </Price>
     <Deconstruct time="20">
       <Item identifier="copper" />
@@ -31,13 +31,13 @@
   </Item>
   <Item name="" identifier="doctorsuniform1" aliases="doctorsuniform" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -62,19 +62,19 @@
       <sprite name="Medic Uniform 1 Left Shoe" texture="Medic1.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="9" maxstacksize="60">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="doctorsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition" >
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition" >
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -99,19 +99,19 @@
       <sprite name="Medic Uniform 2 Left Shoe" texture="Medic2.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="9" maxstacksize="60">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="medicseparatistsuniform1" aliases="doctorsuniform" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -136,19 +136,19 @@
       <sprite name="Medic Uniform 1 Left Shoe" texture="Medic_separatist_01.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="9" maxstacksize="60">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="medicseparatistsuniform2" category="Equipment" cargocontaineridentifier="metalcrate" tags="smallitem,clothing" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <PreferredContainer primary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -173,8 +173,8 @@
       <sprite name="Medic Uniform 2 Left Shoe" texture="Medic_separatist_02.png" limb="LeftFoot" hidelimb="true" inherittexturescale="true" inheritorigin="true" inheritsourcerect="true" />
       <damagemodifier armorsector="0.0,360.0" afflictionidentifiers="lacerations,bitewounds" damagemultiplier="0.95" />
     </Wearable>
-    <ItemContainer capacity="3" maxstacksize="8">
-      <Containable items="chem,medical" />
+    <ItemContainer capacity="9" maxstacksize="60">
+      <Containable items="chem,medical,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Jobgear/Medic/medic_talent_items.xml b/Content/Items/Jobgear/Medic/medic_talent_items.xml
index 21e81fd6..336dcf91 100644
--- a/Content/Items/Jobgear/Medic/medic_talent_items.xml
+++ b/Content/Items/Jobgear/Medic/medic_talent_items.xml
@@ -22,7 +22,7 @@
       <RequiredItem identifier="fpgacircuit" />
     </Fabricate>
     <WifiComponent range="35000.0" LinkToChat="true" MinChatMessageInterval="0.0" />
-    <ItemContainer capacity="1" maxstacksize="1" autoinject="true">
+    <ItemContainer capacity="1" maxstacksize="60" autoinject="true">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
       <Containable items="chem,syringe" />
     </ItemContainer>
@@ -30,7 +30,7 @@
       <sprite name="Headset Wearable" texture="Content/Items/JobGear/TalentGear.png" sourcerect="255,305,72,58" limb="Head" hidelimb="false" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.7" hideotherwearables="false" origin="0.5,0.5" />
     </Wearable>
   </Item>
-  <Item name="" identifier="skillbookeuropanmedicine" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft" cargocontaineridentifier="metalcrate">
+  <Item name="" identifier="skillbookeuropanmedicine" category="Misc" Tags="smallitem,skillbook" maxstacksize="60" scale="0.5" impactsoundtag="impact_soft" cargocontaineridentifier="metalcrate">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40" >
       <Price storeidentifier="merchantoutpost" />
@@ -54,7 +54,7 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="combatstimulantsyringe" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="combatstimulantsyringe" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <Price baseprice="340" sold="false">
       <Price storeidentifier="merchantoutpost" />
@@ -105,7 +105,7 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon"/>
     <SkillRequirementHint identifier="medical" level="35" />
   </Item>
-  <Item name="" identifier="pressurestabilizer" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="pressurestabilizer" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
@@ -153,7 +153,7 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon" inheritrequiredskillsfrom="MeleeWeapon"/>
     <SkillRequirementHint identifier="medical" level="35" />
   </Item>
-  <Item name="" identifier="endocrinebooster" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="endocrinebooster" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,chem,medical,syringe" allowasextracargo="true" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <Price baseprice="1400" sold="false">
       <Price storeidentifier="merchantoutpost" />
@@ -211,7 +211,7 @@
     <PreferredContainer primary="medcab" secondary="medcab"/>
     <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab,outpostmedcab" spawnprobability="0"/>
     <Price baseprice="550" sold="false" minleveldifficulty="65">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="50"/>
       </Price>
       <Price storeidentifier="merchantoutpost" />
@@ -236,18 +236,18 @@
     <InventoryIcon texture="Content/Items/Genetic/Genetic.png" sourcerect="327,62,73,65" origin="0.5,0.5" />
     <Sprite name="Headset" texture="Content/Items/Genetic/Genetic.png" depth="0.6" sourcerect="148,85,73,35" origin="0.5,0.5" />
     <Body radius="8" width="48" density="15" />
-    <ItemContainer capacity="2" maxstacksize="1" />
+    <ItemContainer capacity="6" maxstacksize="60" />
     <Wearable>
       <sprite name="Gene Splicer Wearable" texture="Content/Items/Genetic/Genetic.png" limb="Head" hidelimb="false" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.5" hideotherwearables="false" sourcerect="326,131,67,55" origin="0.6,0.0" />
     </Wearable>
   </Item>
 
   <Item name="" identifier="advancedsyringegun" variantof="syringegun">
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="0" notcampaign="true" />
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="0" notcampaign="true" />
     <PreferredContainer secondary="secarmcab,weaponholder"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0" />
     <Price baseprice="310" sold="false">
-      <Price storeidentifier="merchanthusk" minavailable="1" maxavailable="2" sold="true">
+      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="2" sold="true">
         <Reputation faction="huskcult" min="50"/>
       </Price>
     </Price>
@@ -273,7 +273,7 @@
       <RequiredSkill identifier="weapons" level="30" />
       <RequiredSkill identifier="medical" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="2" maxstacksize="8" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0">
+    <ItemContainer capacity="6" maxstacksize="60" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
       <Containable items="syringe" />
@@ -283,10 +283,10 @@
     <SkillRequirementHint identifier="medical" level="50" />
   </Item>
 
-  <Item name="" identifier="europabrew" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="europabrew" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="200" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -323,7 +323,7 @@
     <Projectile characterusable="false" launchimpulse="20.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon"/>
   </Item>
 
-  <Item name="" identifier="sulphuricacidsyringe" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="sulphuricacidsyringe" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
     <Price baseprice="160" sold="false">
@@ -377,9 +377,9 @@
     <Projectile characterusable="false" launchimpulse="18.0" sticktocharacters="true" launchrotation="-90" inheritstatuseffectsfrom="MeleeWeapon"/>
   </Item>
 
-  <Item name="" identifier="chemgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.05"/>
+  <Item name="" identifier="chemgrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.1"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="80" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
@@ -438,14 +438,14 @@
       </StatusEffect>
     </ItemComponent>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
 
-  <Item name="" identifier="40mmchemgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="grenadelauncher" amount="1" spawnprobability="0"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0"/>
+  <Item name="" identifier="40mmchemgrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="grenadelauncher" amount="2" spawnprobability="0"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
     <Price baseprice="130" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
diff --git a/Content/Items/Jobgear/Security/securityofficer_gear.xml b/Content/Items/Jobgear/Security/securityofficer_gear.xml
index 3835ee51..27eedf17 100644
--- a/Content/Items/Jobgear/Security/securityofficer_gear.xml
+++ b/Content/Items/Jobgear/Security/securityofficer_gear.xml
@@ -3,13 +3,13 @@
   <!-- UNIFORMS START -->
   <Item name="" identifier="securityuniform1" aliases="securityuniform" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -38,13 +38,13 @@
   </Item>
   <Item name="" identifier="securityuniform2" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -73,13 +73,13 @@
   </Item>
   <Item name="" identifier="securityuniform3" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05" />
-    <Price baseprice="150" minavailable="1" requiredfaction="coalition">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="coalition">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -109,12 +109,12 @@
   <Item name="" identifier="securityseparatistsuniform1" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <PreferredContainer secondary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -144,12 +144,12 @@
   <Item name="" identifier="securityseparatistsuniform2" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <PreferredContainer secondary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -179,12 +179,12 @@
   <Item name="" identifier="securityseparatistsuniform3" category="Equipment" tags="smallitem,clothing" fireproof="false" cargocontaineridentifier="metalcrate" description="" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" />
     <PreferredContainer secondary="outpostcrewcabinet" />
-    <Price baseprice="150" minavailable="1" requiredfaction="separatists">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" minavailable="1" />
-      <Price storeidentifier="merchantmine" minavailable="1" />
+    <Price baseprice="150" minavailable="3" requiredfaction="separatists">
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" minavailable="3" />
+      <Price storeidentifier="merchantmine" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
@@ -214,16 +214,16 @@
   <!-- UNIFORMS END -->
   <Item name="" identifier="bodyarmor" category="Equipment" tags="smallitem,clothing" scale="0.35" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.35" />
-    <PreferredContainer primary="secarmcab" amount="3" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="6" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="480">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="40">
       <Item identifier="ballisticfiber" amount="2" />
@@ -246,16 +246,16 @@
   <!-- HEADGEAR START -->
   <Item name="" identifier="ballistichelmet1" aliases="ballistichelmet" category="Equipment" tags="smallitem,helmet" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
     <Upgrade gameversion="0.9.6.0" scale="0.325" />
-    <PreferredContainer primary="secarmcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="320">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -275,16 +275,16 @@
     </Wearable>
   </Item>
   <Item name="" identifier="ballistichelmet2" category="Equipment" tags="smallitem,helmet" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
-    <PreferredContainer primary="secarmcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="320">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -305,16 +305,16 @@
     </Wearable>
   </Item>
   <Item name="" identifier="ballistichelmet3" category="Equipment" tags="smallitem,helmet" cargocontaineridentifier="metalcrate" description="" impactsoundtag="impact_metal_heavy" scale="0.325">
-    <PreferredContainer primary="secarmcab" amount="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer primary="secarmcab" amount="2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="320">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="ballisticfiber" />
@@ -334,17 +334,17 @@
     </Wearable>
   </Item>
   <!-- HEADGEAR END -->
-  <Item name="" identifier="handcuffs" category="Equipment" maxstacksize="8" cargocontaineridentifier="metalcrate" tags="smallitem,handlocker" scale="0.5" impactsoundtag="impact_metal_light" equipconfirmationtext="handcuffequipconfirmation">
+  <Item name="" identifier="handcuffs" category="Equipment" maxstacksize="60" cargocontaineridentifier="metalcrate" tags="smallitem,handlocker" scale="0.5" impactsoundtag="impact_metal_light" equipconfirmationtext="handcuffequipconfirmation">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab,outpostarmcab" amount="2" spawnprobability="0.1" />
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="10">
diff --git a/Content/Items/Jobgear/Security/securityofficer_talent_items.xml b/Content/Items/Jobgear/Security/securityofficer_talent_items.xml
index 2cf97aa1..a2742a02 100644
--- a/Content/Items/Jobgear/Security/securityofficer_talent_items.xml
+++ b/Content/Items/Jobgear/Security/securityofficer_talent_items.xml
@@ -45,18 +45,18 @@
       <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="75" />
     </RangedWeapon>
-    <ItemContainer capacity="2" maxstacksize="12" hideitems="false" containedstateindicatorstyle="bullet" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0" containedspritedepth="0.56">
-      <Containable items="shotgunammo" hide="true"/>
+    <ItemContainer capacity="6" maxstacksize="60" hideitems="false" containedstateindicatorstyle="bullet" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorslot="0" containedspritedepth="0.56">
+      <Containable items="shotgunammo,ammobox,deepdiving,smallitem,mediumitem,largeitem" hide="true"/>
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="26,-2" setactive="true"/>
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="75" />
   </Item>
@@ -108,22 +108,22 @@
       <RequiredItems items="assaultriflemagazine" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="assaultrifleammo" itempos="4,-12" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />   
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="24,4" setactive="true"/>
       </SubContainer>
     </ItemContainer> 
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="assaultriflemagazine" maxstacksize="8" maxstacksizecharacterinventory="2" scale="0.5" category="Weapon" allowasextracargo="true" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,assaultrifleammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="assaultrifle" minamount="1" maxamount="1" spawnprobability="1"/>
+  <Item name="" identifier="assaultriflemagazine" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" category="Weapon" allowasextracargo="true" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,assaultrifleammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="assaultrifle" minamount="2" maxamount="2" spawnprobability="1"/>
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="300" sold="false" minleveldifficulty="60" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
@@ -185,7 +185,7 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="shotgunslugexplosive" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="shotgunslugexplosive" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" allowasextracargo="true" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="75" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
@@ -228,7 +228,7 @@
       <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="0" maxavailable="1" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" maxavailable="3" sold="true">
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" maxavailable="3" sold="true">
         <Reputation faction="separatists" min="50"/>
       </Price>
       <Price storeidentifier="merchantresearch" />
@@ -254,9 +254,9 @@
       <StatValue stattype="TurretChargeSpeed" value="0.1" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="0,0-30" handle2="0,-30" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="8" maxstacksize="32">
+    <ItemContainer capacity="24" maxstacksize="60">
       <SlotIcon texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
-      <Containable items="handheldammo,grenade,handgrenade" />
+      <Containable items="handheldammo,grenade,handgrenade,ammobox,deepdiving,smallitem,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
     
@@ -296,11 +296,11 @@
       </Attack>
     </MeleeWeapon>
     <Quality>
-      <QualityStat stattype="StrikingPowerMultiplier" value="0.1" />
+      <QualityStat stattype="StrikingPowerMultiplier" value="0.3" />
     </Quality>
     <aitarget sightrange="500" soundrange="250" fadeouttime="1" />
   </Item>
-  <Item name="" identifier="skillbooksubmarinewarfare" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbooksubmarinewarfare" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="60" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="350" buyingpricemodifier="2.5" minleveldifficulty="40">
       <Price storeidentifier="merchantoutpost" />
@@ -325,7 +325,7 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="skillbook_warstories" aliases="skillbooksubmarinewarfare_warstories" scale="0.5" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="8" impactsoundtag="impact_soft">
+  <Item name="" identifier="skillbook_warstories" aliases="skillbooksubmarinewarfare_warstories" scale="0.5" cargocontaineridentifier="metalcrate" allowasextracargo="true" category="Misc" Tags="smallitem,skillbook" maxstacksize="60" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="200" sold="false" />
     <InventoryIcon texture="Content/Items/JobGear/TalentGear.png" sourcerect="476,295,35,52" origin="0.5,0.5" />
@@ -363,13 +363,13 @@
       </StatusEffect>
     </Holdable>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1" />
+      <QualityStat stattype="Condition" value="0.3" />
     </Quality>
   </Item>
   <Item name="" identifier="slipsuit" variantof="combatdivingsuit" allowasextracargo="true" botpriority="1.5">
     <Price baseprice="630" sold="false" />
-    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0.0"/>
-    <PreferredContainer primary="wreckdivingsuitcontainer"  spawnprobability="0.0"/>
+    <PreferredContainer primary="divingsuitcontainer" spawnprobability="0"/>
+    <PreferredContainer primary="wreckdivingsuitcontainer"  spawnprobability="0"/>
     <Deconstruct time="30">
       <Item identifier="ballisticfiber" />
       <Item identifier="titaniumaluminiumalloy" />
@@ -393,7 +393,7 @@
     <Body radius="45" width="34" density="20" />
     <Wearable>
       <sprite name="Slipsuit Helmet Wearable" texture="Content/Items/Jobgear/headgears.png" limb="Head" inheritlimbdepth="true" inheritscale="true" ignorelimbscale="true" scale="0.65" hidelimb="false" alphaclipotherwearables="true" sourcerect="0,520,105,124" origin="0.5,0.4">
-        <LightComponent range="200.0" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
+        <LightComponent range="800" lightcolor="250,224,165,255" powerconsumption="10" IsOn="true" allowingameediting="false">
           <StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
             <Conditional IsDead="false" />
           </StatusEffect>
@@ -419,7 +419,7 @@
       <StatValue stattype="WalkingSpeed" value="-0.3" />
     </Wearable>
   </Item>
-  <Item name="" identifier="stungundartfulgurium" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" allowasextracargo="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="stungundartfulgurium" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" allowasextracargo="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="armcab" secondary="secarmcab"/>
     <Price baseprice="120" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
diff --git a/Content/Items/Jobgear/misc.xml b/Content/Items/Jobgear/misc.xml
index a30fb2b0..5ed6764e 100644
--- a/Content/Items/Jobgear/misc.xml
+++ b/Content/Items/Jobgear/misc.xml
@@ -3,11 +3,11 @@
   <Item name="" identifier="headset" scale="0.5" category="Equipment" tags="smallitem,mobileradio" description="" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="crewcab" secondary="divingcab"/>
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" minavailable="6" />
-      <Price storeidentifier="merchantmine" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" minavailable="18" />
+      <Price storeidentifier="merchantmine" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,0,64,64" origin="0.5,0.5" />
     <Sprite name="Headset" texture="Content/Items/Jobgear/headgears.png" depth="0.6" sourcerect="28,321,49,62" origin="0.5,0.5" />
@@ -45,8 +45,8 @@
         <Remove />
       </StatusEffect>
     </Holdable>
-    <ItemContainer capacity="20" keepopenwhenequipped="false" movableframe="true">
-      <Containable items="smallitem,toolbelt,toolbox,bandolier" excludeditems="largemobilecontainer" />
+    <ItemContainer capacity="50" keepopenwhenequipped="false" movableframe="true">
+      <Containable items="smallitem,toolbelt,toolbox,bandolier,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>  
 </Items>
diff --git a/Content/Items/Labels/labels.xml b/Content/Items/Labels/labels.xml
index bc61ee89..d4f23b41 100644
--- a/Content/Items/Labels/labels.xml
+++ b/Content/Items/Labels/labels.xml
@@ -40,7 +40,7 @@
     <ItemLabel scrollable="true" padding="10,5,10,12" textcolor="1,1,1,1">
       <Upgrade gameversion="0.12.0.0" padding="10,5,10,12"/>
     </ItemLabel>
-    <LightComponent range="0.0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false">
+    <LightComponent range="0" lightcolor="255,255,255,0" IsOn="true" castshadows="false" alphablend="false">
       <Upgrade gameversion="0.17.15.0" range="0" />
       <sprite texture="Content/Items/Labels/labels.png" sourcerect="0,48,126,48"  depth="0.025" origin="0.5,0.5" alpha="1.0"/>
     </LightComponent>
diff --git a/Content/Items/Legacy/legacycommand.xml b/Content/Items/Legacy/legacycommand.xml
index 5ee9baac..286278f3 100644
--- a/Content/Items/Legacy/legacycommand.xml
+++ b/Content/Items/Legacy/legacycommand.xml
@@ -50,8 +50,8 @@
       <RequiredItem identifier="screwdriver" type="Equipped"/>
       <input name="power_in" displayname="connection.powerin"/>
       <input name="velocity_in" displayname="connection.steeringvelocityin"/>
-      <output name="velocity_x_out" displayname="connection.velocityxout"/>
-      <output name="velocity_y_out" displayname="connection.velocityyout"/>
+      <output name="velocity_x_out" displayname="connection.velocityxout"maxwires=10 />
+      <output name="velocity_y_out" displayname="connection.velocityyout"maxwires=10 />
     </ConnectionPanel>
 
     <Repairable selectkey="Action" header="electricalrepairsheader" fixDurationHighSkill="10" fixDurationLowSkill="20" msg="ItemMsgRepairScrewdriver" hudpriority="10">
diff --git a/Content/Items/Legacy/legacycontainers.xml b/Content/Items/Legacy/legacycontainers.xml
index 839c8fb0..c0550659 100644
--- a/Content/Items/Legacy/legacycontainers.xml
+++ b/Content/Items/Legacy/legacycontainers.xml
@@ -11,7 +11,7 @@
 
     <Sprite texture="locker.png" depth="0.84" sourcerect="0,0,128,128"/>
 
-    <ItemContainer capacity="30" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem"/>
     </ItemContainer>
@@ -29,7 +29,7 @@
 
     <Sprite texture="cabinets.png" depth="0.84" sourcerect="0,0,48,64" canflipx="false"/>
 
-    <ItemContainer capacity="30" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,chem,medical"/>
     </ItemContainer>
@@ -47,7 +47,7 @@
 
     <Sprite texture="cabinets.png" depth="0.84" sourcerect="0,64,48,64" canflipx="false"/>
 
-    <ItemContainer capacity="30" slotsperrow="6" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
+    <ItemContainer capacity="50" slotsperrow="8" canbeselected="true" hideitems="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.45" anchor="Center" style="ItemUI" />
       <Containable identifiers="smallitem,chem,medical"/>
     </ItemContainer>
diff --git a/Content/Items/Legacy/legacyfabricators.xml b/Content/Items/Legacy/legacyfabricators.xml
index fd9b0b61..53246217 100644
--- a/Content/Items/Legacy/legacyfabricators.xml
+++ b/Content/Items/Legacy/legacyfabricators.xml
@@ -38,7 +38,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="Input" allowuioverlap="true"/>
+    <ItemContainer capacity="15" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="Input" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="Output" allowuioverlap="true"/>
   </Item>
 
@@ -79,7 +79,7 @@
       </StatusEffect>
     </Repairable>
 
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="15" canbeselected="true" hideitems="true" slotsperrow="4" uilabel="" allowuioverlap="true"/>
     <ItemContainer capacity="1" canbeselected="true" hideitems="true" slotsperrow="1" uilabel="" allowuioverlap="true"/>
   </Item>
 
@@ -121,7 +121,7 @@
       </StatusEffect>
     </Repairable>
     
-    <ItemContainer capacity="3" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
-    <ItemContainer capacity="5" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="5" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="9" canbeselected="true" hideitems="true" hudpos="0.5, 0.4" slotsperrow="3" uilabel="" allowuioverlap="true"/>
+    <ItemContainer capacity="15" canbeselected="true" hideitems="true" hudpos="0.5, 0.8" slotsperrow="4" uilabel="" allowuioverlap="true"/>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Legacy/legacyoxygengenerator.xml b/Content/Items/Legacy/legacyoxygengenerator.xml
index b04bc922..a43abb75 100644
--- a/Content/Items/Legacy/legacyoxygengenerator.xml
+++ b/Content/Items/Legacy/legacyoxygengenerator.xml
@@ -36,7 +36,7 @@
   
     <trigger/>
 
-    <ItemContainer capacity="5" maxstacksize="1" canbeselected = "true" msg="ItemMsgOxygenRefill">
+    <ItemContainer capacity="15" maxstacksize="60" canbeselected = "true" msg="ItemMsgOxygenRefill">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <Containable identifiers="oxygentank,oxygenitetank"/>
     </ItemContainer>
diff --git a/Content/Items/Legacy/legacypoweritems.xml b/Content/Items/Legacy/legacypoweritems.xml
index 55c9c81a..54e25aa3 100644
--- a/Content/Items/Legacy/legacypoweritems.xml
+++ b/Content/Items/Legacy/legacypoweritems.xml
@@ -34,11 +34,11 @@
       </StatusEffect>
 
       <RequiredItem identifier="screwdriver" type="Equipped"/>
-      <output name="power" displayname="connection.power"/>
-      <output name="signal_0" displayname="connection.signalx~[num]=0" fallbackdisplayname="connection.signalinx~[num]=0"/>
-      <output name="signal_1" displayname="connection.signalx~[num]=1" fallbackdisplayname="connection.signalinx~[num]=1"/>
-      <output name="signal_2" displayname="connection.signalx~[num]=2" fallbackdisplayname="connection.signalinx~[num]=2"/>
-      <output name="signal_3" displayname="connection.signalx~[num]=3" fallbackdisplayname="connection.signalinx~[num]=3"/>   
+      <output name="power" displayname="connection.power"maxwires=10 />
+      <output name="signal_0" displayname="connection.signalx~[num]=0" fallbackdisplayname="connection.signalinx~[num]=0"maxwires=10 />
+      <output name="signal_1" displayname="connection.signalx~[num]=1" fallbackdisplayname="connection.signalinx~[num]=1"maxwires=10 />
+      <output name="signal_2" displayname="connection.signalx~[num]=2" fallbackdisplayname="connection.signalinx~[num]=2"maxwires=10 />
+      <output name="signal_3" displayname="connection.signalx~[num]=3" fallbackdisplayname="connection.signalinx~[num]=3"maxwires=10 />   
     </ConnectionPanel>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Legacy/legacyrailgun.xml b/Content/Items/Legacy/legacyrailgun.xml
index 727a58ef..dbb81bfd 100644
--- a/Content/Items/Legacy/legacyrailgun.xml
+++ b/Content/Items/Legacy/legacyrailgun.xml
@@ -39,8 +39,8 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
-      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim"/>
-      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" />
+      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim"maxwires=10 />
+      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" maxwires=10 />
     </ConnectionPanel>
     <!-- Controller output was made editable in v1.1.4.0, disallow it on periscopes -->
     <Upgrade gameversion="1.1.4.0" allowingameediting="false" />
@@ -58,8 +58,8 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem identifier="screwdriver" type="Equipped" />
       <input name="power_in" displayname="connection.powerin" />
-      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim"/>
-      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" />
+      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim"maxwires=10 />
+      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" maxwires=10 />
     </ConnectionPanel>
     <!-- Controller output was made editable in v1.1.4.0, disallow it on periscopes -->
     <Upgrade gameversion="1.1.4.0" allowingameediting="false" />
@@ -68,7 +68,7 @@
   <Item name="" identifier="railgunloader" tags="railgunequipment,railgunammosource,turretammosource" category="Legacy" linkable="true" allowedlinks="railgun" scale="0.5" damagedbyexplosions="true" explosiondamagemultiplier="0.2">
     <SwappableItem canbebought="false" origin="149,276"/>
     <Sprite texture="Content/Items/Weapons/LegacyLoaders.png" depth="0.8" sourcerect="0,0,298,276" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="5" slotsperrow="6" itempos="53,-140" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="15" slotsperrow="4" itempos="53,-140" iteminterval="48,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.3,0.2" anchor="Center" style="ItemUI" />
       <Containable items="railgunammo" />
     </ItemContainer>
diff --git a/Content/Items/Legacy/legacysearchlight.xml b/Content/Items/Legacy/legacysearchlight.xml
index a1a27d09..ff98bc3b 100644
--- a/Content/Items/Legacy/legacysearchlight.xml
+++ b/Content/Items/Legacy/legacysearchlight.xml
@@ -22,7 +22,7 @@
       springdampinglowskill="5" springdampinghighskill="5"
       rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="Content/Items/Legacy/SearchLight_legacy.png" origin="0.5, 0.55" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" IsOn="true" powerconsumption="50" drawbehindsubs="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" IsOn="true" powerconsumption="50" drawbehindsubs="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0"/>
       </LightComponent>
     </Turret>
diff --git a/Content/Items/Materials/materials.xml b/Content/Items/Materials/materials.xml
index 4b53abd9..5266bb33 100644
--- a/Content/Items/Materials/materials.xml
+++ b/Content/Items/Materials/materials.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
   <!-- Elements ************************************************************************************************ -->
-  <Item name="" identifier="carbon" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="carbon" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="10" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="5,55,46,38" depth="0.55" origin="0.5,0.5" />
@@ -21,15 +21,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="iron" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_jacket,petfood3,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="iron" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,munition_jacket,petfood3,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="8" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="5,92,46,38" depth="0.55" origin="0.5,0.5" />
@@ -59,15 +59,15 @@
     </Projectile>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="tin" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="tin" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="11" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="150,92,47,38" depth="0.55" origin="0.5,0.5" />
@@ -80,15 +80,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="lead" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,munition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lead" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3,munition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <Price baseprice="18" sold="true" minavailable="3">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <Price baseprice="18" sold="true" minavailable="9">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="18" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="768,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="101,92,47,38" depth="0.55" origin="0.5,0.5" />
@@ -118,15 +118,15 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="phosphorus" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="phosphorus" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="25" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="153,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -138,15 +138,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="copper" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,munition_core,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="copper" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3,munition_core,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="22" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="53,92,48,38" depth="0.55" origin="0.5,0.5" />
@@ -159,15 +159,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="zinc" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="zinc" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,munition_jacket,advmunition_jacket" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="26" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="102,55,46,37" depth="0.55" origin="0.5,0.5" />
@@ -179,21 +179,21 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="sodium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sodium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medfabcab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="33" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="29,7,23,44" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="42" density="20" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -220,15 +220,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="silicon" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="silicon" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="17" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,128,64,64" />
     <Sprite texture="minerals.png" sourcerect="196,54,46,38" depth="0.55" origin="0.5,0.5" />
@@ -240,15 +240,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="calcium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="calcium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" secondary="medfabcab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="31" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="129,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -260,15 +260,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="aluminium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aluminium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="42" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="10" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="53,53,47,39" depth="0.55" origin="0.5,0.5" />
@@ -281,15 +281,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="uranium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,advmunition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="uranium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,advmunition_core,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer primary="storagecab" />
     <Price baseprice="50" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="898,192,61,63" origin="0.5,0.5" />
     <Sprite texture="minerals.png" sourcerect="4,130,49,41" depth="0.55" origin="0.5,0.5" />
@@ -319,20 +319,20 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="potassium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="potassium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
     <Price baseprice="10" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="128,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="77,6,23,44" depth="0.55" origin="0.5,0.5" />
     <Body width="22" height="42" density="15" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,127,39,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -359,15 +359,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="titanium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,advmunition_core,advmunition_tip" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titanium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3,advmunition_core,advmunition_tip" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="65" sold="false" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="3" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="9" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="150,55,46,37" depth="0.55" origin="0.5,0.5" />
@@ -380,15 +380,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="magnesium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="magnesium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,munition_propulsion" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="65">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="2" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="0.8" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="192,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="102,6,23,44" depth="0.55" origin="0.5,0.5" />
@@ -400,21 +400,21 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="lithium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lithium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,explodesinwater" canbepicked="true" description="" cargocontaineridentifier="chemicalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="88" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="3,7,24,44" depth="0.55" origin="0.5,0.5" />
     <Body width="27" height="47" density="15" />
     <Holdable canBeCombined="true" removeOnCombined="true" slots="Any,RightHand,LeftHand" handle1="0,0" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0,0,255" Flicker="1.0" range="100" IsOn="false">
+    <LightComponent LightColor="255,0,0,255" Flicker="1.0" range="400" IsOn="false">
       <StatusEffect type="OnActive" target="This" IsOn="false">
         <Conditional target="This" InWater="false" />
       </StatusEffect>
@@ -441,15 +441,15 @@
       </StatusEffect>
     </LightComponent>
   </Item>
-  <Item name="" identifier="chlorine" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chlorine" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="11" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="20" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="60" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,256,64,64" />
     <Sprite texture="minerals.png" sourcerect="55,7,22,44" depth="0.6" origin="0.5,0.5" />
@@ -461,15 +461,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="thorium" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="thorium" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="125" sold="false" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.1" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
-      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="5" />
+      <Price storeidentifier="merchantmine" sold="true" multiplier="0.8" minavailable="15" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,192,64,64" />
     <Sprite texture="minerals.png" sourcerect="54,131,46,39" depth="0.55" origin="0.5,0.5" />
@@ -482,15 +482,15 @@
     </Holdable>
   </Item>
   <!-- Compounds ************************************************************************************************ -->
-  <Item name="" identifier="steel" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3,munition_core,advmunition_core,advmunition_tip,scrapcannonammo" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="steel" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3,munition_core,advmunition_core,advmunition_tip,scrapcannonammo" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="28">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="7" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="21" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="45" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="60" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -529,15 +529,15 @@
     </Projectile>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="titaniumaluminiumalloy" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titaniumaluminiumalloy" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,petfood3" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.04" />
     <Price baseprice="150" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="30" />
@@ -559,15 +559,15 @@
     </Holdable>
     <AiTarget sightrange="1000" static="true" />
   </Item>
-  <Item name="" identifier="plastic" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="plastic" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="45">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="7" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="10" />
-      <Price storeidentifier="merchantresearch" minavailable="12" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="21" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="30" />
+      <Price storeidentifier="merchantresearch" minavailable="36" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="27" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="45" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="20" />
@@ -588,15 +588,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="ballisticfiber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="ballisticfiber" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1" />
     <Price baseprice="160" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="6" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="5">
       <RequiredSkill identifier="mechanical" level="40" />
@@ -617,15 +617,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="organicfiber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="organicfiber" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer primary="medfabcab" />
     <Price baseprice="30">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="24" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,768,64,64" />
     <Sprite texture="minerals.png" sourcerect="178,8,42,45" depth="0.55" origin="0.5,0.5" />
@@ -637,15 +637,15 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="rubber" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="rubber" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.2" />
     <Price baseprice="20">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="9" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="13" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="27" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="39" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="24" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="0,770,64,64" />
     <Sprite texture="minerals.png" sourcerect="133,221,35,32" depth="0.55" origin="0.5,0.5" />
@@ -657,14 +657,14 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="flashpowder" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,explosive" impacttolerance="8" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="flashpowder" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,explosive" impacttolerance="8" useinhealthinterface="true" scale="0.4" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="90">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="6" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="7" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="18" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="21" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
     <Fabricate suitablefabricators="fabricator,medicalfabricator" requiredtime="5">
@@ -695,9 +695,9 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="scrap" sonarsize="2" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" aliases="scrap1,scrap2,scrap3,scrap4,scrap5,scrap6,scrap7,scrap8">
+  <Item name="" identifier="scrap" sonarsize="2" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,scrapcannonammo" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" aliases="scrap1,scrap2,scrap3,scrap4,scrap5,scrap6,scrap7,scrap8">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab,wreckreactorcab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="wreckstoragecab,wreckreactorcab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="5" sold="false" />
     <Deconstruct time="10" chooserandom="true" amount="2">
       <Item identifier="iron" commonness="0.8" />
@@ -738,12 +738,12 @@
     </Projectile>
   </Item>
   <!-- ALIEN MATERIALS -->
-  <Item name="" identifier="incendium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="incendium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" multiplier="1.25" />
       <Price storeidentifier="merchantcity" multiplier="1.15" />
@@ -782,18 +782,18 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="fulgurium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="fulgurium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" canbepicked="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
       <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="1" />
+      <Price storeidentifier="merchantresearch" multiplier="1.1" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="328,833,51,63" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Alien/AlienMaterials.png" sourcerect="186,351,59,67" depth="0.55" origin="0.5,0.5" />
@@ -814,12 +814,12 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="physicorium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="physicorium" category="Material,Alien" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" multiplier="1.25" />
       <Price storeidentifier="merchantcity" multiplier="1.15" />
@@ -846,12 +846,12 @@
       <RequiredItem items="cuttingequipment" type="Equipped" />
     </LevelResource>
   </Item>
-  <Item name="" identifier="dementonite" category="Material,Alien" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="dementonite" category="Material,Alien" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="storagecab" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.02" />
-    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.04" />
+    <PreferredContainer secondary="ruinstorage,ruinstoragesmall" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="0.8" />
     <Price baseprice="200" sold="false" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" multiplier="1.25" />
       <Price storeidentifier="merchantcity" multiplier="1.15" />
diff --git a/Content/Items/Materials/medmaterials.xml b/Content/Items/Materials/medmaterials.xml
index ec607ad4..2c08ce5e 100644
--- a/Content/Items/Materials/medmaterials.xml
+++ b/Content/Items/Materials/medmaterials.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="fiberplant" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="fiberplant" category="Material" Tags="smallitem,plant" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <Price baseprice="100">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
@@ -17,7 +17,7 @@
     </Deconstruct>
     <!--   <InventoryIcon texture="Content/Items/Materials/Minerals.png" sourcerect="0,0,108,166" -->
     <ContainedSprite texture="Content/Items/Materials/Minerals.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="257,0,96,128" origin="0.5,0.5" />
-    <LightComponent lightcolor="208,139,211,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="208,139,211,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Sprite texture="Content/Items/Materials/Minerals.png" depth="0.2" sourcerect="545,386,54,78" origin="0.5,0.5" />
@@ -42,16 +42,16 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="elastinplant" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="elastinplant" category="Material" Tags="smallitem,plant" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="139,211,197,100" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="139,211,197,100" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
@@ -83,16 +83,16 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="aquaticpoppy" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="aquaticpoppy" category="Material" Tags="smallitem,plant" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="139,211,197,100" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="139,211,197,100" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
@@ -122,16 +122,16 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="yeastshroom" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="yeastshroom" category="Material" Tags="smallitem,plant" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="112,174,199,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="112,174,199,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="200">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
@@ -160,16 +160,16 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="slimebacteria" category="Material" Tags="smallitem,plant" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
+  <Item name="" identifier="slimebacteria" category="Material" Tags="smallitem,plant" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" minamount="1" maxamount="2" spawnprobability="0.05" />
-    <LightComponent lightcolor="222,153,79,150" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <PreferredContainer secondary="wreckstoragecab" minamount="2" maxamount="4" spawnprobability="0.1" />
+    <LightComponent lightcolor="222,153,79,150" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
     </Price>
@@ -198,9 +198,9 @@
       </StatusEffect>
     </Holdable>
   </Item>
-  <Item name="" identifier="paralyxis" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,ore" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
+  <Item name="" identifier="paralyxis" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,ore" scale="0.5" cargocontaineridentifier="metalcrate" canbepicked="true">
     <PreferredContainer primary="medfabcab" secondary="medcontainer" />
-    <PreferredContainer secondary="wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Price baseprice="190" sold="false" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" multiplier="1.25" />
       <Price storeidentifier="merchantcity" multiplier="1.15" />
diff --git a/Content/Items/Materials/minerals.xml b/Content/Items/Materials/minerals.xml
index 093b484a..541a1ae3 100644
--- a/Content/Items/Materials/minerals.xml
+++ b/Content/Items/Materials/minerals.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="titanite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="titanite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="250" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
@@ -18,7 +18,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="113,204,164,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="113,204,164,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,730,86,147" origin="0.5,0.5" />
@@ -41,10 +41,10 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="brockite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="brockite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="150" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
@@ -57,7 +57,7 @@
       <Item identifier="thorium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="178,108,109,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,108,109,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,731,86,147" origin="0.5,0.5" />
@@ -80,7 +80,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="thorianite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="thorianite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -94,7 +94,7 @@
       <Item identifier="thorium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="85,877,88,147" origin="0.5,0.5" />
@@ -117,10 +117,10 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="amblygonite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="amblygonite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
-    <PreferredContainer secondary="ruinstoragelarge" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="ruintreasure" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="ruinstoragelarge" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="ruintreasure" minamount="2" maxamount="6" spawnprobability="1" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
@@ -134,7 +134,7 @@
       <Item identifier="sodium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="211,189,89,120" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="211,189,89,120" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.5" sourcerect="0,5,84,144" origin="0.5,0.5" />
@@ -157,7 +157,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="sphalerite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sphalerite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -172,7 +172,7 @@
       <Item identifier="zinc" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="196,196,196,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="196,196,196,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="172,585,84,147" origin="0.5,0.5" />
@@ -194,7 +194,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="pyromorphite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="pyromorphite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="30" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -208,7 +208,7 @@
       <Item identifier="chlorine" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="115,154,127,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="115,154,127,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,292,86,147" origin="0.5,0.5" />
@@ -230,7 +230,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="quartz" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="quartz" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -243,7 +243,7 @@
       <Item identifier="silicon" />
       <Item identifier="silicon" />
     </Deconstruct>
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,585,86,147" origin="0.5,0.5" />
@@ -266,7 +266,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="diamond" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="diamond" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -280,7 +280,7 @@
       <Item identifier="carbon" />
       <Item identifier="carbon" />
     </Deconstruct>
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="938,0,86,147" origin="0.5,0.5" />
@@ -303,7 +303,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="hydroxyapatite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="hydroxyapatite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -318,7 +318,7 @@
       <Item identifier="phosphorus" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="179,173,154,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="179,173,154,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="426,292,86,147" origin="0.5,0.5" />
@@ -341,7 +341,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="uraniumore" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="uraniumore" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -356,7 +356,7 @@
       <Item identifier="uranium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="83,160,100,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="83,160,100,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="768,731,86,147" origin="0.5,0.5" />
@@ -379,7 +379,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="ilmenite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ilmenite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -392,7 +392,7 @@
       <Item identifier="titanium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="117,143,123,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="117,143,123,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="597,292,84,147" origin="0.5,0.5" />
@@ -415,7 +415,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="stannite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="stannite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -430,7 +430,7 @@
       <Item identifier="tin" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="766,883,88,133" origin="0.5,0.5" />
@@ -453,7 +453,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chalcopyrite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chalcopyrite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="60" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -467,7 +467,7 @@
       <Item identifier="copper" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="162,135,83,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="162,135,83,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,438,86,148" origin="0.5,0.5" />
@@ -489,7 +489,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="esperite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="esperite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -521,7 +521,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="galena" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="galena" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" />
     <Price baseprice="70" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -535,7 +535,7 @@
       <Item identifier="lead" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="117,139,162,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="117,139,162,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,877,86,147" origin="0.5,0.5" />
@@ -557,7 +557,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="triphylite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="triphylite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -570,7 +570,7 @@
       <Item identifier="lithium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="127,174,170,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="127,174,170,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="256,0,86,147" origin="0.5,0.5" />
@@ -592,7 +592,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="langbeinite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="langbeinite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -607,7 +607,7 @@
       <Item identifier="magnesium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="150,125,105,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="150,125,105,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,146,86,147" origin="0.5,0.5" />
@@ -630,7 +630,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chamosite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chamosite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="130" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -646,7 +646,7 @@
       <Item identifier="aluminium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="69,158,142,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="69,158,142,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,438,86,148" origin="0.5,0.5" />
@@ -669,7 +669,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="ironore" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="ironore" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -685,7 +685,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,438,86,148" origin="0.5,0.5" />
@@ -708,7 +708,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="polyhalite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="polyhalite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="50" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -722,7 +722,7 @@
       <Item identifier="calcium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="134,99,88" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="134,99,88" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="768,146,86,147" origin="0.5,0.5" />
@@ -745,7 +745,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="graphite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="graphite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -759,7 +759,7 @@
       <Item identifier="carbon" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="512,0,86,147" origin="0.5,0.5" />
@@ -782,7 +782,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="sylvite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="sylvite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="70" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -797,7 +797,7 @@
       <Item identifier="potassium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,89,67,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,89,67,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="256,146,86,147" origin="0.5,0.5" />
@@ -820,7 +820,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="lazulite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="lazulite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="25" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -834,7 +834,7 @@
       <Item identifier="iron" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="88,121,142,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="88,121,142,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="341,731,86,147" origin="0.5,0.5" />
@@ -857,7 +857,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="bornite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="bornite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="60" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -871,7 +871,7 @@
       <Item identifier="copper" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="119,82,124,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="119,82,124,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,438,86,148" origin="0.5,0.5" />
@@ -894,7 +894,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="cassiterite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="cassiterite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="40" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -909,7 +909,7 @@
       <Item identifier="tin" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="153,82,66,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="153,82,66,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="597,877,84,147" origin="0.5,0.5" />
@@ -931,7 +931,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="cryolite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="cryolite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="80" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -945,7 +945,7 @@
       <Item identifier="sodium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="160,175,187,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="160,175,187,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,144,86,147" origin="0.5,0.5" />
@@ -968,7 +968,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="aragonite" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="aragonite" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="80" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -982,7 +982,7 @@
       <Item identifier="calcium" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="187,157,67,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="187,157,67,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="0,292,86,147" origin="0.5,0.5" />
@@ -1005,7 +1005,7 @@
     </LevelResource>
     <Holdable slots="Any,RightHand,LeftHand" msg="ItemMsgUsePlasmaCutter" handle1="0,0" pickingtime="5.0" attachable="true" reattachable="false" />
   </Item>
-  <Item name="" identifier="chrysoprase" category="Material" Tags="smallitem,ore" maxstacksize="32" maxstacksizecharacterinventory="8" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="chrysoprase" category="Material" Tags="smallitem,ore" maxstacksize="60" maxstacksizecharacterinventory="60" canbepicked="true" description="" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="mineralcab" secondary="storagecab" />
     <Price baseprice="40" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
@@ -1018,7 +1018,7 @@
       <Item identifier="silicon" amount="2" />
     </Deconstruct>
     <!-- TODO: sprite and inventory icon -->
-    <LightComponent lightcolor="115,148,82,225" range="100" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="115,148,82,225" range="400" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ContainedSprite texture="Content/Items/Materials/MineralEnvironment.png" usewhenattached="true" decorativespritebehavior="HideWhenNotVisible" depth="0.55" sourcerect="853,585,86,147" origin="0.5,0.5" />
@@ -1044,7 +1044,7 @@
   <Item name="" identifier="piezocrystal" category="Material" Tags="" canbepicked="false" description="" scale="0.5" sonarsize="30" health="60" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true">
     <Sprite texture="Content/Items/Materials/Crystal.png" depth="1.0" sourcerect="0,4,1024,1020" origin="0.5,0.6" />
     <Body width="500" height="500" density="25" bodytype="Static" />
-    <LightComponent lightcolor="178,196,207,255" range="4000.0" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,196,207,255" range="16000" powerconsumption="0" flicker="0.2" flickerspeed="0.5" pulsefrequency="0.2" pulseamount="0.8" ison="true" drawbehindsubs="true">
       <StatusEffect type="OnBroken" target="This" disabledeltatime="true">
         <particleemitter particle="iceshards" particleamount="200" velocitymin="100" velocitymax="3000" anglemin="0" anglemax="360" scalemin="0.5" scalemax="3.0" />
         <Explosion range="1000.0" ballastfloradamage="1000" structuredamage="600" itemdamage="1000" force="50.0" severlimbsprobability="1.5" decal="explosion" decalsize="1.0" camerashake="500" camerashakerange="50000" flashrange="10000" flashduration="5.0" screencolor="255,255,255,255" screencolorrange="5000" screencolorduration="3.0">
@@ -1058,7 +1058,7 @@
         <RemoveItem />
       </StatusEffect>
     </LightComponent>
-    <LightComponent lightcolor="178,196,207,255" range="4000.0" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="1.0" ison="true" drawbehindsubs="true">
+    <LightComponent lightcolor="178,196,207,255" range="16000" powerconsumption="0" flicker="0.0" flickerspeed="0.5" pulsefrequency="0.4" pulseamount="1.0" ison="true" drawbehindsubs="true">
       <LightTexture texture="Content/Lights/pointlight_rays.png" origin="0.5,0.5" />
     </LightComponent>
     <ElectricalDischarger duration="0.2" outdoorsonly="true" powerconsumption="0" range="3500" rangemultiplierinwalls="1">
diff --git a/Content/Items/Medical/buffs.xml b/Content/Items/Medical/buffs.xml
index 46bd40d6..53523500 100644
--- a/Content/Items/Medical/buffs.xml
+++ b/Content/Items/Medical/buffs.xml
@@ -3,19 +3,19 @@
   <!-- Name: Methamphetamine -->
   <!-- Description: A potent nervous system stimulant. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Methamphetamine name="" identifier="meth" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Methamphetamine name="" identifier="meth" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
     <Price baseprice="50">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="3" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantnightclub" minavailable="4" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30">
       <RequiredSkill identifier="medical" level="30" />
@@ -77,17 +77,17 @@
   <!-- Name: Anabolic Steroids -->
   <!-- Description: Temporarily increases muscular strength and physical performance. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <AnabolicSteroids name="" identifier="steroids" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <AnabolicSteroids name="" identifier="steroids" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
     <Price baseprice="350">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="6" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
@@ -146,19 +146,19 @@
   <!-- Name: Hyperzine -->
   <!-- Description: An extremely potent muscle stimulant for those moments when you gotta go fast. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Hyperzine name="" identifier="hyperzine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Hyperzine name="" identifier="hyperzine" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
-    <Price baseprice="450" minavailable="1">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
+    <Price baseprice="450" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantnightclub" minavailable="3" />
+      <Price storeidentifier="merchantnightclub" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="60">
       <RequiredSkill identifier="medical" level="40" />
@@ -221,21 +221,21 @@
   <!-- Medical alcohol used as an ingredient in the manufacture of various medicines. Drinking while on duty is not advised. 
        Pouring on skin treats mild infections yet causes small burns.-->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Ethanol name="" identifier="ethanol" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical,petfood2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Ethanol name="" identifier="ethanol" category="Medical,Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical,petfood2" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="sprayer" amount="1" spawnprobability="1"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.3" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="sprayer" amount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.6" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
     <PreferredContainer primary="medfabcab" secondary="medcab"/>
-    <Price baseprice="60" minavailable="6" >
+    <Price baseprice="60" minavailable="18" >
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
       <Price storeidentifier="merchantmine" multiplier="1.1" />
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="2" />
-      <Price storeidentifier="merchantnightclub" minavailable="4" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="80" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,768,64,64" origin="0.5,0.5" />
@@ -275,12 +275,12 @@
   <!-- Name: Energy Drink -->
   <!-- Applies heightened speed for a while, but also has a probability to cause nausea. Only at vending machines. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <EnergyDrink name="" identifier="energydrink" category="Medical,Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.15" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.3" />
     <Price baseprice="40" sold="false">
-      <Price storeidentifier="merchantnightclub" minavailable="4" sold="true" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" sold="true" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="64,768,64,64" origin="0.5,0.5" />
@@ -308,10 +308,10 @@
   <!-- Name: Protein bar -->
   <!-- Provides slow healing for damage and burns. Only at vending machines. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <ProteinBar name="" identifier="proteinbar" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <ProteinBar name="" identifier="proteinbar" category="Medical,Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="2" spawnprobability="0.15" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="4" spawnprobability="0.3" />
     <PreferredContainer primary="crewcab"/>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="40" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="0,768,64,64" origin="0.5,0.5" />
@@ -340,11 +340,11 @@
   <!-- Name: Mind Sense -->
   <!-- Gives the user temporarily the ability to highlight enemies, similar to Thermal Goggles -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <MindSense identifier="mindsense" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <MindSense identifier="mindsense" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,chem,medical" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.05" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
     <Price baseprice="280" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
@@ -392,11 +392,11 @@
   <!-- Name: Mind Wipe -->
   <!-- Resets the talent points of the character, overuse can lose points -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <MindWipe identifier="mindwipe" category="Medical" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <MindWipe identifier="mindwipe" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="medcab"/>
     <PreferredContainer secondary="crewcab" />
-    <PreferredContainer primary="ruinstoragelarge" amount="1" spawnprobability="0.03" />
-    <PreferredContainer primary="ruintreasure" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="ruinstoragelarge" amount="2" spawnprobability="0.06" />
+    <PreferredContainer primary="ruintreasure" amount="2" spawnprobability="0.2" />
     <Price baseprice="860" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
@@ -428,16 +428,16 @@
       </StatusEffect>
     </Holdable>
   </MindWipe>
-  <Item name="" nameidentifier="beerbottle" identifier="beerbottle1" category="Medical,Misc" maxstacksize="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="1" maxamount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="crewcab" amount="1" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
+  <Item name="" nameidentifier="beerbottle" identifier="beerbottle1" category="Medical,Misc" maxstacksize="60" cargocontaineridentifier="mediccrate" description="" Tags="smallitem" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="abandonedcrewcab,piratecrewcab" minamount="2" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="crewcab" amount="2" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
     <PreferredContainer primary="medfabcab" secondary="medcab"/>
     <Price baseprice="60" sold="false">
       <Price storeidentifier="merchantclown" minavailable="0" maxavailable="3" sold="true">
         <Reputation faction="clowns" min="30"/>
       </Price>
-      <Price storeidentifier="merchantnightclub" minavailable="20" sold="true" />
+      <Price storeidentifier="merchantnightclub" minavailable="60" sold="true" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="2" fabricationlimitmax="6"/>
     <Sprite texture="Content/Map/Outposts/Art/AdminResidentAssets.png" sourcerect="835,0,20,63" depth="0.6" origin="0.5,0.5" />
diff --git a/Content/Items/Medical/medical.xml b/Content/Items/Medical/medical.xml
index 374c3913..68080009 100644
--- a/Content/Items/Medical/medical.xml
+++ b/Content/Items/Medical/medical.xml
@@ -6,16 +6,16 @@
   <!-- Name: Bandage -->
   <!-- Description: Basic bandages, useful in the treatment of bleeding wounds and burns. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Bandage name="" identifier="antibleeding1" aliases="Bandage" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="8" useinhealthinterface="true" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
+  <Bandage name="" identifier="antibleeding1" aliases="Bandage" category="Medical" Tags="smallitem,medical" maxstacksize="60" maxstacksizecharacterinventory="60" useinhealthinterface="true" cargocontaineridentifier="mediccrate" description="" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="supplycab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="supplycab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="30" minavailable="25">
+    <Price baseprice="30" minavailable="75">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
@@ -57,15 +57,15 @@
   <!-- Name: Plastiseal -->
   <!-- Description: A synthetic skin with hemostatic properties, able to quickly seal most wounds. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Plastiseal name="" identifier="antibleeding2" category="Medical" Tags="smallitem,medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
+  <Plastiseal name="" identifier="antibleeding2" category="Medical" Tags="smallitem,medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_soft" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <Price baseprice="100">
-      <Price storeidentifier="merchantmedical" minavailable="12" />
+      <Price storeidentifier="merchantmedical" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="25" amount="3">
       <RequiredSkill identifier="medical" level="16" />
@@ -103,14 +103,14 @@
   <!-- Description: An antibiotic glue with hemostatic properties. Seals bleeding wounds almost immediately and treats burns and infections very effectively. Use with care as it may cause mobile 
   clots in the bloodstream. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <AntibioticGlue name="" identifier="antibleeding3" category="Medical" Tags="smallitem,medical" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <AntibioticGlue name="" identifier="antibleeding3" category="Medical" Tags="smallitem,medical" maxstacksize="60" maxstacksizecharacterinventory="60" MaxStackSizeHoldableOrWearableInventory="1" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1" />
     <Price baseprice="190">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="10" minleveldifficulty="25" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="30" minleveldifficulty="25" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="45" amount="1" >
       <RequiredSkill identifier="medical" level="48" />
@@ -161,17 +161,17 @@
   <!-- Name: Morphine -->
   <!-- Description: A powerful opiate for treating pain associated with internal injuries, but will cause shortness of breath and eventual dependency with overuse. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Morphine name="" identifier="antidama1" aliases="Corrigodone" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Morphine name="" identifier="antidama1" aliases="Corrigodone" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="supplycab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="supplycab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="100" minavailable="12">
+    <Price baseprice="100" minavailable="36">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
@@ -236,16 +236,16 @@
   <!-- Name: Fentanyl -->
   <!-- Description: A powerful opiate for treating pain associated with internal injuries, but will cause shortness of breath and eventual dependency with overuse. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Fentanyl name="" identifier="antidama2" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Fentanyl name="" identifier="antidama2" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.4" />
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="3" spawnprobability="0.3" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
-    <Price baseprice="190" minavailable="1">
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="12" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.8" />
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="6" spawnprobability="0.6" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
+    <Price baseprice="190" minavailable="3">
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="36" />
     </Price>
     <SuitableTreatment type="damage" suitability="75" />
     <SuitableTreatment identifier="opiateoverdose" suitability="-50" />
@@ -311,13 +311,13 @@
   <!-- Name: Pomegrenade Extract -->
   <!-- Description: A crappy but non lethal alternative to opiods, made from pomegrenades.-->
   <!-- *************************************************************************************************************************************************************************** -->
-  <pomegrenadeextract name="" identifier="pomegrenadeextract" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <pomegrenadeextract name="" identifier="pomegrenadeextract" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="medcab" minamount="4" maxamount="8" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="medcontainer"/>
-    <Price baseprice="80" minavailable="4">
+    <Price baseprice="80" minavailable="12">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -378,12 +378,12 @@
   <!-- Name: Saline -->
   <!-- Description: A sodium chloride infusion mildly useful in the treatment of blood loss. Small relief when used on infected tissue. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Saline name="" identifier="antibloodloss1" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1,petfood2,petfood3" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
+  <Saline name="" identifier="antibloodloss1" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1,petfood2,petfood3" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="3" spawnprobability="0.5" />
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="6" spawnprobability="1" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="50" minavailable="12">
+    <Price baseprice="50" minavailable="36">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
@@ -432,14 +432,14 @@
   <!-- Name: Blood Pack -->
   <!-- Description: A pack of blood substitute for the treatment of blood loss. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <BloodPack name="" identifier="antibloodloss2" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
+  <BloodPack name="" identifier="antibloodloss2" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,petfood1" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" minamount="2" maxamount="3" notcampaign="true"/>
-    <PreferredContainer secondary="outpostmedcab" minamount="1" maxamount="2" spawnprobability="0.2"/>
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer primary="medcab" minamount="4" maxamount="6" notcampaign="true"/>
+    <PreferredContainer secondary="outpostmedcab" minamount="2" maxamount="4" spawnprobability="0.4"/>
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="medcontainer"/>
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.02"/>
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.04"/>
     <Price baseprice="240">
       <Price storeidentifier="merchantmedical" multiplier="0.9"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
@@ -481,10 +481,10 @@
   <!-- Description: A highly potent stimulant effective in the treatment of internal damage, oxygen deprivation, blood loss and, to a lesser extent, bleeding. Produces mild burns as a side 
   effect. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Deusizine name="" identifier="deusizine" aliases="Auxiliriozine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Deusizine name="" identifier="deusizine" aliases="Auxiliriozine" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.2" />
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.02" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.4" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.04" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="500">
       <Price storeidentifier="merchantmedical" multiplier="0.9" minleveldifficulty="50"/>
@@ -585,18 +585,18 @@
   <!-- Name: Liquid Oxygenite -->
   <!-- Description: A mildly toxic solution that slowly releases oxygen into the bloodstream when injected. Avoid dropping. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <LiquidOxygenite name="" identifier="liquidoxygenite" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" impacttolerance="8" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <LiquidOxygenite name="" identifier="liquidoxygenite" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" impacttolerance="8" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="9" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.9" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="12" />
     </Price>
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.1" />  
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.2" />  
     <SuitableTreatment identifier="organdamage" suitability="-30" />
     <SuitableTreatment identifier="oxygenlow" suitability="30" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,640,64,64" origin="0.5,0.5" />
@@ -669,20 +669,20 @@
   <!-- Name: Calyxanide -->
   <!-- An antiparasitic drug used in the treatment of husk parasite infections. Might require higher dosage to cure the infection at later stages. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Calyxanide name="" identifier="calyxanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Calyxanide name="" identifier="calyxanide" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.03" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.06" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="510">
-      <Price storeidentifier="merchantoutpost" minavailable="5" />
-      <Price storeidentifier="merchantcity" minavailable="5" />
-      <Price storeidentifier="merchantresearch" minavailable="7" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="5" />
-      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="5" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchanthusk" minavailable="3" maxavailable="5">
+      <Price storeidentifier="merchantoutpost" minavailable="15" />
+      <Price storeidentifier="merchantcity" minavailable="15" />
+      <Price storeidentifier="merchantresearch" minavailable="21" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="15" />
+      <Price storeidentifier="merchantmine" multiplier="1.1" minavailable="15" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="21" />
+      <Price storeidentifier="merchanthusk" minavailable="9" maxavailable="5">
         <Reputation faction="huskcult" min="30"/>
       </Price>
     </Price>
@@ -751,13 +751,13 @@
   <!-- Name: Haloperidol -->
   <!-- A strong antipsychotic drug. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Haloperidol name="" identifier="antipsychosis" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Haloperidol name="" identifier="antipsychosis" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="130" minavailable="4">
+    <Price baseprice="130" minavailable="12">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
       <Price storeidentifier="merchantresearch"/>
@@ -814,13 +814,13 @@
   <!-- Name: Naloxone -->
   <!-- An opioid antagonist for the treatment of opiate-based withdrawal and overdose. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Naloxone name="" identifier="antinarc" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Naloxone name="" identifier="antinarc" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" description="" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.4" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
-    <Price baseprice="100" minavailable="2">
+    <Price baseprice="100" minavailable="6">
       <Price storeidentifier="merchantmedical" multiplier="0.9"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -874,12 +874,12 @@
   <!-- Name: Morbusine Antidote -->
   <!-- An antidote for acute morbusine poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <MorbusineAntidote name="" identifier="morbusineantidote" aliases="Morbusanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <MorbusineAntidote name="" identifier="morbusineantidote" aliases="Morbusanide" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="250" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -887,7 +887,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2"/>
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="6"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -934,12 +934,12 @@
   <!-- Name: Cyanide Antidote -->
   <!-- An antidote for acute cyanide poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <CyanideAntidote name="" identifier="cyanideantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <CyanideAntidote name="" identifier="cyanideantidote" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="350" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -947,7 +947,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2"/>
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="6"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -994,12 +994,12 @@
   <!-- Name: Sufforin Antidote -->
   <!-- An antidote for acute sufforin poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <SufforinAntidote name="" identifier="sufforinantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <SufforinAntidote name="" identifier="sufforinantidote" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="125" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -1007,7 +1007,7 @@
       <Price storeidentifier="merchantresearch"/>
       <Price storeidentifier="merchantmilitary"/>
       <Price storeidentifier="merchantmine"/>
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="2"/>
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="6"/>
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="30" >
@@ -1054,12 +1054,12 @@
   <!-- Name: Deliriumine Antidote -->
   <!-- An antidote for acute deliriumine poisoning. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <DeliriumineAntidote name="" identifier="deliriumineantidote" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <DeliriumineAntidote name="" identifier="deliriumineantidote" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="medcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer primary="medcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer secondary="medcontainer"/>
     <Price baseprice="125" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost"/>
@@ -1113,11 +1113,11 @@
   <!-- Name: AntiRad -->
   <!-- Slows down cellular degradation caused by radiation. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <AntiRad name="" identifier="antirad" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <AntiRad name="" identifier="antirad" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="1" spawnprobability="0.1" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" amount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="125" minleveldifficulty="11">
       <Price storeidentifier="merchantoutpost"/>
@@ -1171,12 +1171,12 @@
   <!-- Name: Paralysis Antidote -->
   <!-- An antidote for paralysis. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <ParalysisAntidote name="" identifier="antiparalysis" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <ParalysisAntidote name="" identifier="antiparalysis" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wrecksupplycab" amount="1" spawnprobability="0.3" />
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.8" />
-    <PreferredContainer secondary="outpostmedcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="outpostmedcompartment" amount="1" spawnprobability="0.06" />
+    <PreferredContainer secondary="wrecksupplycab" amount="2" spawnprobability="0.6" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="outpostmedcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="outpostmedcompartment" amount="2" spawnprobability="0.12" />
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Price baseprice="200" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
@@ -1236,17 +1236,17 @@
   <!-- Name: Elastin -->
   <!-- A highly elastic, naturally occurring protein. Useful for crafting. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Elastin name="" identifier="elastin" category="Material" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem" cargocontaineridentifier="mediccrate" scale="0.5" impactsoundtag="impact_soft">
+  <Elastin name="" identifier="elastin" category="Material" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,chem" cargocontaineridentifier="mediccrate" scale="0.5" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer primary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer primary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="40">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="24" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="8" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="24" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="772,771,52,59" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="465,452,47,60" depth="0.6" origin="0.5,0.5" />
@@ -1261,19 +1261,19 @@
   <!-- Name: Opium -->
   <!-- A relatively mild opioid obtained from aquatic poppy. Most commonly used to manufacture morphine and fentanyl. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Opium name="" identifier="opium" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
+  <Opium name="" identifier="opium" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,chem" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.2" />
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.4" />
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="8" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="24" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="8" />
-      <Price storeidentifier="merchantnightclub" minavailable="4" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="24" />
+      <Price storeidentifier="merchantnightclub" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <SuitableTreatment type="damage" suitability="20" />
@@ -1315,17 +1315,17 @@
   <!-- Name: Broad-spectrum Antibiotics -->
   <!-- An antibiotic that acts against a wide range of disease-causing bacteria, though with the side effect of internal damage and Alcohol Sensitivity. Used as an ingredient in many medical compounds. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Antibiotics name="" identifier="antibiotics" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,chem,medical,syringe" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
+  <Antibiotics name="" identifier="antibiotics" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,chem,medical,syringe" description="" cargocontaineridentifier="mediccrate" scale="0.5" useinhealthinterface="true" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="60" fabricationlimitmin="5" fabricationlimitmax="10"/>
@@ -1392,17 +1392,17 @@
   </Antibiotics>
   <!-- Name: Stabilozine -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Stabilozine name="" identifier="stabilozine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" tags="smallitem,chem,medical,syringe" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Stabilozine name="" identifier="stabilozine" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" tags="smallitem,chem,medical,syringe" cargocontaineridentifier="mediccrate" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
     <Price baseprice="40">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="30" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="45" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="45" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,640,64,64" origin="0.5,0.5" />
     <Sprite texture="Medicines.png" sourcerect="112,139,37,70" depth="0.6" origin="0.5,0.5" />
@@ -1444,17 +1444,17 @@
   <!-- Name: Adrenaline -->
   <!-- A naturally occurring hormone, useful as short-term treatment and prevention for stun, while also keeping the patient from falling to life-threatening unconsciousness. Can be used to manufacture medicine or combat stimulants. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Adrenaline name="" identifier="adrenaline" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Adrenaline name="" identifier="adrenaline" category="Medical,Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,chem,medical,syringe" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="1" maxamount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedmedcab,piratemedcab,wreckmedcab" minamount="2" maxamount="4" spawnprobability="1" />
     <Price baseprice="60">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
       <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
-      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmedical" multiplier="0.9" minavailable="12" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="129,448,62,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="301,209,37,72" depth="0.6" origin="0.5,0.5" />
@@ -1485,22 +1485,22 @@
   <!-- Name: Tonic Liquid  -->
   <!-- Description: A medical solution that's mildly effective as a treatment for internal damage, but is more commonly used to increase the duration of performance enhancing drugs. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <TonicLiquid name="" identifier="tonicliquid" category="Medical,Material" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" impactsoundtag="impact_metal_light">
+  <TonicLiquid name="" identifier="tonicliquid" category="Medical,Material" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,medical" description="" useinhealthinterface="true" scale="0.3" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="medfabcab" secondary="medcontainer"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="1" maxamount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab" minamount="2" maxamount="4" spawnprobability="0.2" />
     <SuitableTreatment type="damage" suitability="1" />
     <SuitableTreatment type="burn" suitability="-10" />
     <SuitableTreatment identifier="opiateoverdose" suitability="-10" />
     <SuitableTreatment identifier="oxygenlow" suitability="-10" />
     <SuitableTreatment identifier="opiatewithdrawal" suitability="-10" />
-    <Price baseprice="75" minavailable="3">
+    <Price baseprice="75" minavailable="9">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="7" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="8" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="21" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="30" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.1" minavailable="24" />
       <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantnightclub" minavailable="1" />
+      <Price storeidentifier="merchantnightclub" minavailable="3" />
     </Price>
     <Fabricate suitablefabricators="vendingmachine" requiredtime="1" requiredmoney="100" fabricationlimitmin="5" fabricationlimitmax="10"/>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20" amount="2">
diff --git a/Content/Items/Medical/poisons.xml b/Content/Items/Medical/poisons.xml
index d9c4c3b9..c9530873 100644
--- a/Content/Items/Medical/poisons.xml
+++ b/Content/Items/Medical/poisons.xml
@@ -6,11 +6,11 @@
   <!-- Name: Morbusine -->
   <!-- Description: Causes oxygen deprivation. Kills relatively quickly, but not effective on bigger creatures -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Morbusine name="" identifier="morbusine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Morbusine name="" identifier="morbusine" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.02" />
-    <Price baseprice="200" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.04" />
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -72,14 +72,14 @@
   <!-- Name: Chloral Hydrate -->
   <!-- Description: A sedative that can be used to knock someone out for a short period of time. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <ChloralHydrate name="" identifier="chloralhydrate" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <ChloralHydrate name="" identifier="chloralhydrate" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
-    <Price baseprice="100" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.2" />
+    <Price baseprice="100" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.1" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.1" />
     </Price>
@@ -129,11 +129,11 @@
   <!-- Name: Cyanide -->
   <!-- Description: Sudden death for normal characters. Works even on the strongest creatures, but it might take time. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Cyanide name="" identifier="cyanide" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Cyanide name="" identifier="cyanide" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -193,11 +193,11 @@
   <!-- Name: Radiotoxin -->
   <!-- Description: A highly potent neurotoxin. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Radiotoxin name="" identifier="radiotoxin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Radiotoxin name="" identifier="radiotoxin" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="200" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="200" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -248,11 +248,11 @@
   <!-- Name: Sufforin -->
   <!-- Description: disables slowly, makes very sick, eventually lethal. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Sufforin name="" identifier="sufforin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Sufforin name="" identifier="sufforin" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="100" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="100" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -311,11 +311,11 @@
   <!-- Name: Deliriumine -->
   <!-- Description: A psychosis-inducing toxin. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Deliriumine name="" identifier="deliriumine" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Deliriumine name="" identifier="deliriumine" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -364,11 +364,11 @@
   <!-- Name: Paralyzant -->
   <!-- Description: slows down effectively, but doesn't kill. In high doses effective even on the biggest monsters.-->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Paralyzant name="" identifier="paralyzant" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Paralyzant name="" identifier="paralyzant" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="380" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="380" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="0.9" />
@@ -426,11 +426,11 @@
   <!-- Name: Raptor bane extract -->
   <!-- Description: Causes vomiting in humans, severely harms raptors. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <raptorbaneextract name="" identifier="raptorbaneextract" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <raptorbaneextract name="" identifier="raptorbaneextract" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,syringe" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
-    <Price baseprice="250" minavailable="1">
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
+    <Price baseprice="250" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.1" />
       <Price storeidentifier="merchantcity" multiplier="1.3" />
       <Price storeidentifier="merchantresearch" />
@@ -490,9 +490,9 @@
   <!-- Name: Hallucinogenic Bufotoxin -->
   <!-- Description: A hallucinogenic toxin. Has an antiparalyzant effect. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <Bufotoxin name="" identifier="hallucinogenicbufotoxin" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Bufotoxin name="" identifier="hallucinogenicbufotoxin" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="chemicalcrate" Tags="smallitem,chem,poison,medical" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
-    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.05" />
+    <PreferredContainer primary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.1" />
     <Price baseprice="200" sold="false" />
     <Deconstruct time="20">
       <Item identifier="antibloodloss1" />
@@ -517,17 +517,17 @@
   <!-- Name: Sulphuric Acid -->
   <!-- A strong acid that causes burns when in contact with skin. Used as an ingredient in several poisons. -->
   <!-- *************************************************************************************************************************************************************************** -->
-  <SulphuricAcid name="" identifier="sulphuricacid" category="Medical" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="mediccrate" description="" Tags="smallitem,chem,poison" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <SulphuricAcid name="" identifier="sulphuricacid" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" description="" Tags="smallitem,chem,poison" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="0.5" />
+    <PreferredContainer secondary="wrecktoxcab,abandonedtoxcab,piratetoxcab" spawnprobability="1" />
     <PreferredContainer primary="toxcab" secondary="toxcontainer"/>
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.25" />
       <Price storeidentifier="merchantcity" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantresearch" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" multiplier="1.1" sold="false"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,768,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Medical/Medicines.png" sourcerect="346,452,33,60" depth="0.6" origin="0.5,0.5" />
diff --git a/Content/Items/Misc/misc.xml b/Content/Items/Misc/misc.xml
index bc40921a..359dbcbe 100644
--- a/Content/Items/Misc/misc.xml
+++ b/Content/Items/Misc/misc.xml
@@ -3,8 +3,8 @@
   <Item name="" identifier="guitar" category="Misc" Tags="bigitem,instrument" scale="0.5" description="" price="300" isshootable="true">
     <Upgrade gameversion="0.9.2.0" scale="0.5"/>
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -27,11 +27,11 @@
     </Holdable>
   </Item>
   <Item name="" identifier="harmonica" category="Misc" Tags="smallitem,instrument" cargocontaineridentifier="metalcrate" scale="0.5" description="" price="300" impactsoundtag="impact_metal_light" isshootable="true">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -48,11 +48,11 @@
     </Holdable>
   </Item>
   <Item name="" identifier="accordion" category="Misc" Tags="smallitem,instrument" scale="0.5" description="" price="300" impactsoundtag="impact_metal_light" isshootable="true">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>
     <Price baseprice="50">
-      <Price storeidentifier="merchantoutpost" minavailable="1"/>
-      <Price storeidentifier="merchantcity" minavailable="1"/>
+      <Price storeidentifier="merchantoutpost" minavailable="3"/>
+      <Price storeidentifier="merchantcity" minavailable="3"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -68,8 +68,8 @@
   </Item>
   
   <Item name="" identifier="captainspipe" category="Misc" Tags="smallitem" scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" isshootable="true" requireaimtouse="true">
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>
     <Price baseprice="50">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
@@ -101,19 +101,19 @@
         <RequiredItem items="pipetobacco" type="Contained" />
       </StatusEffect>
     </Holdable>
-    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="74,-281" iteminterval="0,0" itemrotation="0" canbeselected="false" containedspritedepth="0.79">
+    <ItemContainer hideitems="true" drawinventory="true" capacity="1" maxstacksize="60" slotsperrow="6" itempos="74,-281" iteminterval="0,0" itemrotation="0" canbeselected="false" containedspritedepth="0.79">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="0,384,64,64" origin="0.5,0.5" />
       <Containable items="pipetobacco" />
     </ItemContainer>
   </Item>
 
-  <Item name="" identifier="pipetobacco" category="Misc" maxstacksize="32" maxstacksizecharacterinventory="8" Tags="smallitem,pipetobacco" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="pipetobacco" category="Misc" maxstacksize="60" maxstacksizecharacterinventory="60" Tags="smallitem,pipetobacco" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" isshootable="true">
     <PreferredContainer primary="captainspipe" spawnprobability="1"/>
-    <PreferredContainer primary="crewcab" spawnprobability="0.05" notcampaign="true"/>
-    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.1"/>  
+    <PreferredContainer primary="crewcab" spawnprobability="0.1" notcampaign="true"/>
+    <PreferredContainer secondary="wreckcrewcab,abandonedcrewcab,piratecrewcab" spawnprobability="0.2"/>  
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="1"/>
-      <Price storeidentifier="merchantcity" multiplier="0.9"  minavailable="2"/>
+      <Price storeidentifier="merchantoutpost" multiplier="1.1" minavailable="3"/>
+      <Price storeidentifier="merchantcity" multiplier="0.9"  minavailable="6"/>
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" />
@@ -165,7 +165,7 @@
 
   <Item name="" identifier="researcherscribble1" nameidentifier="alientranslator" descriptionidentifier=" " allowstealingalways="true" spritecolor="20,39,162,255" category="Misc" hideinmenus="true" Tags="smallitem" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab" secondary="locker"/>
-    <PreferredContainer secondary="researchcontainer" spawnprobability="0.05"/>
+    <PreferredContainer secondary="researchcontainer" spawnprobability="0.1"/>
     <InventoryIcon texture="Content/Items/Misc/scribble1.png" sourcerect="0,0,768,1024" origin="0.5,0.5" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="367,194,12,44"  origin="0.5,0.5" depth="0.8" />
     <Body width="35" height="40" density="8" />
diff --git a/Content/Items/Misc/pvp_items.xml b/Content/Items/Misc/pvp_items.xml
index a351fa84..a3812f23 100644
--- a/Content/Items/Misc/pvp_items.xml
+++ b/Content/Items/Misc/pvp_items.xml
@@ -8,8 +8,8 @@
     <Sprite texture="Content/Items/Containers/containers.png" depth="0.54" sourcerect="407,376,152,89" origin="0.5,0.5" />
     <Body width="150" height="75" density="25" />
     <Holdable slots="RightHand+LeftHand" holdpos="0,-80" handle1="-30,14" handle2="30,14" aimable="false" msg="ItemMsgPickUpSelect" />
-    <ItemContainer capacity="20" maxstacksize="32" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
-      <Containable items="smallitem,mediumitem" excludeditems="toolbelt,toolbox,bandolier,cargoscooter,largemobilecontainer" />
+    <ItemContainer capacity="50" maxstacksize="60" canbeselected="false" hideitems="true" keepopenwhenequipped="true" movableframe="true">
+      <Containable items="smallitem,mediumitem,ammobox,deepdiving,largeitem" />
       <StatusEffect type="OnSpawn" target="this">
         <SpawnItem identifier="revolver" spawnposition="ThisInventory" count="1" />
         <SpawnItem identifier="revolverround" spawnposition="ThisInventory" mincount="12" maxcount="24" />
@@ -21,7 +21,7 @@
         <Remove />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="157,1,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -59,7 +59,7 @@
         <SpawnItem identifier="medicinebelt_tier1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -137,7 +137,7 @@
         <SpawnItem identifiers="piratehelmet" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -209,7 +209,7 @@
         <SpawnItem identifier="chitinhelmet" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -226,7 +226,7 @@
         <SpawnItem identifiers="piratehelmet" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -276,7 +276,7 @@
         <SpawnItem identifiers="ballistichelmet1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -291,7 +291,7 @@
         <SpawnItem identifiers="ballistichelmet1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -306,7 +306,7 @@
         <SpawnItem identifiers="ballistichelmet1" spawnposition="ThisInventory" count="1" />
       </StatusEffect>
     </ItemContainer>
-    <LightComponent range="120.0" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
+    <LightComponent range="480" lightcolor="255,224,0,80" alphablend="true" powerconsumption="0" IsOn="true" castshadows="false" allowingameediting="false" pulseamount="0.5" pulsefrequency="0.2">
       <Sprite texture="Content/Items/Containers/containers2.png" depth="0.53" sourcerect="311,0,152,89" origin="0.5,0.5" alpha="1.0" />
     </LightComponent>
   </Item>
@@ -323,8 +323,8 @@
       <sprite name="ToolBelt" texture="Content/Items/Tools/tools.png" sourcerect="256,102,112,54" limb="Torso" inherittexturescale="true" origin="0.5,-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="6" maxstacksize="32" depth="0.5" >
-      <Containable items="smallitem" excludeditems="toolbelt,toolbox,bandolier" />
+    <ItemContainer capacity="18" maxstacksize="60" depth="0.5" >
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
       <StatusEffect type="OnSpawn" target="this">
         <SpawnItem identifier="antibleeding1" spawnposition="ThisInventory" mincount="4" maxcount="8" />
         <SpawnItem identifier="antibloodloss1" spawnposition="ThisInventory" mincount="4" maxcount="8" />
diff --git a/Content/Items/Misc/traitor_items.xml b/Content/Items/Misc/traitor_items.xml
index e576eae7..aa4351c2 100644
--- a/Content/Items/Misc/traitor_items.xml
+++ b/Content/Items/Misc/traitor_items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="deepdiverduck" category="Misc" Tags="smallitem,traitormissionitem" maxstacksize="1" impacttolerance="4" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" impactsoundtag="impact_metal_heavy">
+  <Item name="" identifier="deepdiverduck" category="Misc" Tags="smallitem,traitormissionitem" maxstacksize="60" impacttolerance="4" inventoryiconcolor="110,120,110,255" spritecolor="110,120,110" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="storagecab" />
     <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0" />
     <Price baseprice="38" sold="false" canbespecial="false">
@@ -46,7 +46,7 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="huskfigurine" category="Misc" maxstacksize="2" Tags="smallitem,traitormissionitem" scale="0.5" health="10" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" isshootable="true">
+  <Item name="" identifier="huskfigurine" category="Misc" maxstacksize="60" Tags="smallitem,traitormissionitem" scale="0.5" health="10" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" isshootable="true">
     <Price baseprice="50" sold="false" canbespecial="false">
       <Price storeidentifier="merchantoutpost"/>
       <Price storeidentifier="merchantcity"/>
@@ -111,7 +111,7 @@
   </Item>
 
   <!-- Basic time bomb, can be dumped into water to get rid of -->
-  <Item name="" identifier="traitortimebomb" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="1" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="traitortimebomb" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="60" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
     <Price baseprice="160" sold="false" canbespecial="false" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" depth="0.55" sourcerect="448,198,38,76" origin="0.5,0.5" />
     <Body width="30" height="70" density="20" />
@@ -138,7 +138,7 @@
         <sound file="Content/Items/Weapons/ExplosionDebris2.ogg" range="6000" />
       </StatusEffect>
     </Throwable>
-    <LightComponent LightColor="248,81,81,100" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
+    <LightComponent LightColor="248,81,81,100" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
       <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="492,218,17,7" origin="0.5,0.5"/>
       <StatusEffect type="OnActive" target="This" interval="1" Condition="-1.0" disabledeltatime="true">
         <sound file="Content/Items/Button/Switch1.ogg" range="200" frequencymultiplier="1.5" volume="0.75" />
@@ -147,7 +147,7 @@
   </Item>
 
   <!-- Variant that cannot be dumped into the water to get rid of, it explodes and probably still nukes the ship -->
-  <Item name="" identifier="traitortimebomb2" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="1" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="traitortimebomb2" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="60" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
     <Price baseprice="160" sold="false" canbespecial="false" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" depth="0.55" sourcerect="448,198,38,76" origin="0.5,0.5" />
     <Body width="30" height="70" density="20" />
@@ -174,7 +174,7 @@
         <sound file="Content/Items/Weapons/ExplosionDebris2.ogg" range="6000" />
       </StatusEffect>
     </Throwable>
-    <LightComponent LightColor="248,81,81,100" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
+    <LightComponent LightColor="248,81,81,100" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
       <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="492,218,17,7" origin="0.5,0.5"/>
       <StatusEffect type="OnActive" target="This" interval="1" Condition="-1.0" disabledeltatime="true">
         <sound file="Content/Items/Button/Switch1.ogg" range="200" frequencymultiplier="1.5" volume="0.75" />
@@ -193,7 +193,7 @@
   </Item>
 
   <!-- Variant that needs battery renewed, water = boom -->
-  <Item name="" identifier="traitortimebomb3" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="1" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="traitortimebomb3" category="Weapon" hideinmenus="true" Tags="smallitem,explosive,traitorbomb,traitormissionitem" maxstacksize="60" Scale="0.5" health="120" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light">
     <Price baseprice="160" sold="false" canbespecial="false" />
     <Sprite texture="Content/Map/Outposts/Art/FactionItems.png" depth="0.55" sourcerect="448,198,38,76" origin="0.5,0.5" />
     <Body width="30" height="70" density="20" />
@@ -232,7 +232,7 @@
         <Conditional InWater="true"/>
       </StatusEffect>
     </Powered>
-    <LightComponent LightColor="248,81,81,100" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
+    <LightComponent LightColor="248,81,81,100" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="0,16">
       <sprite texture="Content/Map/Outposts/Art/FactionItems.png" sourcerect="492,218,17,7" origin="0.5,0.5"/>
       <StatusEffect type="OnActive" target="Contained" Condition="-0.1" interval="1" disabledeltatime="true">
         <RequiredItem items="mobilebattery" type="Contained" />
@@ -248,7 +248,7 @@
         <sound file="Content/Items/AlarmBuzzerLoop.ogg" range="1000.0" frequencymultiplier="2.0" />
       </StatusEffect>
     </LightComponent>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -256,7 +256,7 @@
     </ItemContainer>
   </Item>
 
-  <Item name="" identifier="bloodsamplevial" hideinmenus="true" category="Medical" maxstacksize="8" maxstacksizecharacterinventory="1" cargocontaineridentifier="mediccrate" Tags="smallitem,traitormissionitem" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
+  <Item name="" identifier="bloodsamplevial" hideinmenus="true" category="Medical" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="mediccrate" Tags="smallitem,traitormissionitem" description="" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
     <PreferredContainer primary="medcab" secondary="medcontainer"/>
     <Deconstruct time="20">
       <Item identifier="opium" />
@@ -329,7 +329,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="231,102,25,54" depth="0.55" origin="0.5,0.5" />    
     <Body width="23" height="50" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="0,-15" msg="ItemMsgPickUpSelect" />    
-    <LightComponent LightColor="0,255,0,255" range="25" powerconsumption="10" flicker="1" blinkfrequency="2" castshadows="false" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0,255,0,255" range="100" powerconsumption="10" flicker="1" blinkfrequency="2" castshadows="false" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-1.66" Interval="1" disabledeltatime="true">
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
@@ -346,7 +346,7 @@
         <StatusEffect type="OnSecondaryUse" targettype="This" IsOn="false" />
       </TickBox>
     </CustomInterface>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -426,7 +426,7 @@
   <Item name="" identifier="coilgunammobox_blanks" nameidentifier="coilgunammobox" variantof="coilgunammobox" hideinmenus="true">
     <PreferredContainer primary="coilgunammoloader" spawnprobability="0" />
     <PreferredContainer spawnprobability="0" />
-    <PreferredContainer spawnprobability="0.01" /><!-- Tiny chance Thalamus/wrecks get the funny ammo -->
+    <PreferredContainer spawnprobability="0.02" /><!-- Tiny chance Thalamus/wrecks get the funny ammo -->
     <PreferredContainer spawnprobability="0" />
     <Price sold="false" />
     <Deconstruct time="10">
@@ -462,7 +462,7 @@
     </Projectile>
   </Item>
 
-  <Item name="" identifier="huskeggs_huskroulette_harmless" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="1" maxstacksizecharacterinventory="1">
+  <Item name="" identifier="huskeggs_huskroulette_harmless" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="60" maxstacksizecharacterinventory="60">
     <PreferredContainer primary="toxcontainer" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0" />
     <PreferredContainer secondary="medfabcab"/>
@@ -478,7 +478,7 @@
     </MeleeWeapon>
   </Item>
 
-  <Item name="" identifier="huskeggs_huskroulette_infect" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="1" maxstacksizecharacterinventory="1">
+  <Item name="" identifier="huskeggs_huskroulette_infect" nameidentifier="huskeggs" variantof="huskeggs" Tags="smallitem,syringe,huskroulette,traitormissionitem" hideinmenus="true" maxstacksize="60" maxstacksizecharacterinventory="60">
     <PreferredContainer primary="toxcontainer" spawnprobability="0" notcampaign="true"/>
     <PreferredContainer primary="wrecktoxcontainer" spawnprobability="0" />
     <PreferredContainer secondary="medfabcab"/>
diff --git a/Content/Items/OxygenGenerator/oxygengenerator.xml b/Content/Items/OxygenGenerator/oxygengenerator.xml
index e77eadd4..68f53840 100644
--- a/Content/Items/OxygenGenerator/oxygengenerator.xml
+++ b/Content/Items/OxygenGenerator/oxygengenerator.xml
@@ -40,7 +40,7 @@
                       offset="0,5" offsetanim="Sine" offsetanimspeed="0.5">
       <AnimationConditional Voltage="gt 0.5" targetitemcomponent="OxygenGenerator" />
     </DecorativeSprite>
-   <LightComponent range="140.0" lightcolor="255,184,108,193" powerconsumption="5" IsOn="false" castshadows="false" allowingameediting="false" />
+   <LightComponent range="560" lightcolor="255,184,108,193" powerconsumption="5" IsOn="false" castshadows="false" allowingameediting="false" />
 
     <OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected="true" msg="ItemMsgInteractSelect">
       <poweronsound file="Content/Items/PowerOnLight2.ogg" range="1500" loop="false" />
@@ -59,7 +59,7 @@
   
     <trigger/>
 
-    <ItemContainer capacity="5" maxstacksize="1" canbeselected="true" hideitems="false" itempos="31,-250" iteminterval="44.5,0" msg="ItemMsgOxygenRefill">
+    <ItemContainer capacity="15" maxstacksize="60" canbeselected="true" hideitems="false" itempos="31,-250" iteminterval="44.5,0" msg="ItemMsgOxygenRefill">
       <Upgrade gameversion="0.15.22.1" itempos="31,-250" iteminterval="44.5,0" />
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -80,7 +80,7 @@
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel"/>
       <RequiredItem items="screwdriver" type="Equipped"/>
       <input name="power_in" displayname="connection.powerin"/>
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
 
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="750" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
@@ -160,7 +160,7 @@
 
     <trigger/>
 
-    <ItemContainer capacity="3" maxstacksize="1" canbeselected = "true" hideitems="false" itempos="185,-172" iteminterval="27,0" msg="ItemMsgOxygenRefill" containedspritedepth="0.81">
+    <ItemContainer capacity="9" maxstacksize="60" canbeselected = "true" hideitems="false" itempos="185,-172" iteminterval="27,0" msg="ItemMsgOxygenRefill" containedspritedepth="0.81">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -189,7 +189,7 @@
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped"/>
       <input name="power_in" displayname="connection.powerin"/>
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
 
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.125" mindeteriorationdelay="120" maxdeteriorationdelay="750" mindeteriorationcondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25" msg="ItemMsgRepairWrench" hudpriority="10">
diff --git a/Content/Items/Pets/PetEggs.xml b/Content/Items/Pets/PetEggs.xml
index 1c2b427c..ebd71c83 100644
--- a/Content/Items/Pets/PetEggs.xml
+++ b/Content/Items/Pets/PetEggs.xml
@@ -1,12 +1,12 @@
 <Items>
   <Item name="" identifier="peanutegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="265,5,43,55" origin="0.5,0.5" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
+      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -26,7 +26,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="60">
       <Containable items="antibloodloss1">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
@@ -38,12 +38,12 @@
   </Item>
   <Item name="" identifier="psilotoadegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="265,133,43,55" origin="0.5,0.5" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
+      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -63,7 +63,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="60">
       <Containable items="antibloodloss1">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
@@ -75,12 +75,12 @@
   </Item>
   <Item name="" identifier="orangeboyegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="266,259,44,56" origin="0.5,0.5" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="1.2"  />
-      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="1" />
+      <Price storeidentifier="merchantresearch" multiplier="1.4" minavailable="3" />
       <Price storeidentifier="merchantmilitary" sold="false" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="0.75" />
     </Price>
@@ -100,7 +100,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="60">
       <Containable items="antibloodloss1">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
@@ -112,7 +112,7 @@
   </Item>
   <Item name="" identifier="balloonegg" nameidentifier="petegg" Tags="smallitem,monsterfood" hideinmenus="true" health="100" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft">
     <PreferredContainer primary="crewcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1" />
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="11,389,43,55" origin="0.5,0.5" />
     <Price baseprice="500" sold="false" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" />
@@ -137,7 +137,7 @@
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-5.0"/>
     </Holdable>
-    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="1">
+    <ItemContainer capacity="1" hideitems="true" showcontainedstateindicator="false" maxstacksize="60">
       <Containable items="antibloodloss1">
         <StatusEffect type="OnContaining" target="Contained" Condition="-1"/>
         <StatusEffect type="OnContaining" target="This" Condition="0" setvalue="true">
diff --git a/Content/Items/Pets/PetItems.xml b/Content/Items/Pets/PetItems.xml
index 28bb4e48..bacbdc2b 100644
--- a/Content/Items/Pets/PetItems.xml
+++ b/Content/Items/Pets/PetItems.xml
@@ -1,5 +1,5 @@
 <Items>
-  <Item name="" identifier="poop" nameidentifier="poop" Tags="smallitem" maxstacksize="8" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6">
+  <Item name="" identifier="poop" nameidentifier="poop" Tags="smallitem" maxstacksize="60" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="387,15,53,41" origin="0.5,0.5" />
     <Deconstruct time="10">
       <Item identifier="carbon" />
@@ -17,7 +17,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item name="" identifier="food" nameidentifier="food" Tags="smallitem,petfood1,petfood2,petfood3,monsterfood" maxstacksize="8" hideinmenus="true" health="50" damagedbyexplosions="true" category="Misc" scale="0.5" impactsoundtag="impact_metal_light" cargocontaineridentifier="metalcrate">
+  <Item name="" identifier="food" nameidentifier="food" Tags="smallitem,petfood1,petfood2,petfood3,monsterfood" maxstacksize="60" hideinmenus="true" health="50" damagedbyexplosions="true" category="Misc" scale="0.5" impactsoundtag="impact_metal_light" cargocontaineridentifier="metalcrate">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.7" sourcerect="206,390,34,53" origin="0.5,0.5" />
     <Price baseprice="120" minleveldifficulty="10">
       <Price storeidentifier="merchantoutpost"/>
@@ -49,7 +49,7 @@
     <Pickable slots="Card,Any" msg="ItemMsgPickUpSelect" />
   </Item>
 
-  <Item identifier="mucusball" Tags="smallitem" maxstacksize="8" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
+  <Item identifier="mucusball" Tags="smallitem" maxstacksize="60" hideinmenus="true" health="20" damagedbyexplosions="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyrepairtools="true" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.2" sourcerect="330,11,42,44" origin="0.5,0.5" />
     <Price baseprice="1" sold="false" canbespecial="false" />
     <Deconstruct time="10">
@@ -71,7 +71,7 @@
       </StatusEffect>
     </Throwable>
   </Item>
-  <Item identifier="chitin" Tags="smallitem" maxstacksize="8" hideinmenus="true" health="20" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
+  <Item identifier="chitin" Tags="smallitem" maxstacksize="60" hideinmenus="true" health="20" category="Misc" scale="0.5" impactsoundtag="impact_soft" impacttolerance="6" cargocontaineridentifier="metalcrate">
     <Sprite texture="Content/Characters/Pets/pets.png" depth="0.2" sourcerect="330,265,52,44" origin="0.5,0.5" />
     <Price baseprice="1" sold="false" canbespecial="false" />
     <Deconstruct time="10">
diff --git a/Content/Items/Pump/pump.xml b/Content/Items/Pump/pump.xml
index 54bf3f22..e437eff1 100644
--- a/Content/Items/Pump/pump.xml
+++ b/Content/Items/Pump/pump.xml
@@ -14,7 +14,7 @@
       <IsActiveConditional Condition="gt 0.0" />
     </DecorativeSprite>
     <DecorativeSprite texture="Content/Items/Pump/Pumps.png" depth="0.78" offset="-130,70" sourcerect="109,456,43,43"/>
-    <LightComponent range="40.0" lightcolor="199,96,64,88" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" />
+    <LightComponent range="160" lightcolor="199,96,64,88" powerconsumption="5" IsOn="true" castshadows="false" allowingameediting="false" />
     <Pump canbeselected="true" maxflow="600" PowerConsumption="300.0" MinVoltage="0.3" IsOn="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.25,0.2" minsize="420,220" anchor="Center" style="ItemUI" />
       <sound file="Content/Items/Pump/Pump.ogg" type="OnActive" range="800.0" volumeproperty="CurrFlow" volume="0.01" loop="true" />
@@ -46,7 +46,7 @@
       <input name="set_active" displayname="connection.setstate" />
       <input name="set_speed" displayname="connection.setpumpingspeed" />
       <input name="set_targetlevel" displayname="connection.settargetwaterlevel" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" deteriorationspeed="0.125" 
                 mindeteriorationdelay="60" maxdeteriorationdelay="270" MinDeteriorationCondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25"
@@ -103,7 +103,7 @@
       <input name="set_active" displayname="connection.setstate" />
       <input name="set_speed" displayname="connection.setpumpingspeed" />
       <input name="set_targetlevel" displayname="connection.settargetwaterlevel" />
-      <output name="condition_out" displayname="connection.conditionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
     </ConnectionPanel>
     <Repairable selectkey="Action" header="mechanicalrepairsheader" 
                 deteriorationspeed="0.2" mindeteriorationdelay="60" maxdeteriorationdelay="240" MinDeteriorationCondition="0" RepairThreshold="80" fixDurationHighSkill="5" fixDurationLowSkill="25"
diff --git a/Content/Items/Reactor/reactor.xml b/Content/Items/Reactor/reactor.xml
index 159bcec7..9ab8432c 100644
--- a/Content/Items/Reactor/reactor.xml
+++ b/Content/Items/Reactor/reactor.xml
@@ -63,12 +63,12 @@
       <StatusEffect type="OnBroken" target="Contained" Condition="0.0" setvalue="true" />
       <SkillRequirementHint identifier="electrical" level="50" />
     </Reactor>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
       <sprite texture="Content/Items/Reactor/reactor.png" depth="0.025" sourcerect="523,0,482,336" origin="0.5,0.45" alpha="1.0" />
     </LightComponent>
-    <LightComponent range="10.0" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false" blinkfrequency="1">
+    <LightComponent range="40" lightcolor="255,255,255,0" powerconsumption="0" IsOn="false" castshadows="false" alphablend="false" allowingameediting="false" blinkfrequency="1">
       <Upgrade gameversion="0.9.600.0" lightcolor="255,255,255,0" />
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
       <sprite texture="Content/Items/Reactor/reactor.png" depth="0.025" sourcerect="523,337,482,336" origin="0.5,0.45" alpha="1.0" />
@@ -92,19 +92,19 @@
         <ParticleEmitter particle="ElectricShock" DistanceMin="10" DistanceMax="25" ParticleAmount="5" ScaleMin="0.1" ScaleMax="0.12" />
       </StatusEffect>
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="power_out" displayname="connection.powerout" maxwires="1" />
-      <output name="temperature_out" displayname="connection.temperatureout" />
+      <output name="power_out" displayname="connection.powerout" maxwires="1" maxwires=10 />
+      <output name="temperature_out" displayname="connection.temperatureout" maxwires=10 />
       <input name="shutdown" displayname="connection.shutdown" />
-      <output name="meltdown_warning" displayname="connection.meltdownwarning"/>
+      <output name="meltdown_warning" displayname="connection.meltdownwarning"maxwires=10 />
       <input name="set_fissionrate" displayname="connection.setfissionrate" />
       <input name="set_turbineoutput" displayname="connection.setturbineoutput" />
-      <output name="power_value_out" displayname="connection.powervalueout" />
-      <output name="load_value_out" displayname="connection.loadvalueout" />
-      <output name="fuel_out" displayname="connection.availablefuelout" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="fuel_percentage_left" displayname="connection.fuelpercentageout" />
+      <output name="power_value_out" displayname="connection.powervalueout" maxwires=10 />
+      <output name="load_value_out" displayname="connection.loadvalueout" maxwires=10 />
+      <output name="fuel_out" displayname="connection.availablefuelout" maxwires=10 />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="fuel_percentage_left" displayname="connection.fuelpercentageout" maxwires=10 />
     </ConnectionPanel>
-    <ItemContainer capacity="4" maxstacksize="1" canbeselected="true" hudpos="0.5,0.15" slotsperrow="1" uilabel="FuelRods">
+    <ItemContainer capacity="12" maxstacksize="60" canbeselected="true" hudpos="0.5,0.15" slotsperrow="4" uilabel="FuelRods">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="192,448,64,64" origin="0.5,0.5" />
diff --git a/Content/Items/SearchLight/searchlight.xml b/Content/Items/SearchLight/searchlight.xml
index ead0c572..d9a4be2a 100644
--- a/Content/Items/SearchLight/searchlight.xml
+++ b/Content/Items/SearchLight/searchlight.xml
@@ -25,7 +25,7 @@
       springdampinglowskill="5" springdampinghighskill="5"
       rotationspeedlowskill="0.5" rotationspeedhighskill="0.5">
       <BarrelSprite texture="Content/Items/SearchLight/SearchLightBase.png" sourcerect="99,0,64,88" origin="0.5, 0.75" />
-      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" powerconsumption="50" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0"/>
       </LightComponent>
     </Turret>
diff --git a/Content/Items/Shipwrecks/wreckeditems.xml b/Content/Items/Shipwrecks/wreckeditems.xml
index ceb8da23..159bfaac 100644
--- a/Content/Items/Shipwrecks/wreckeditems.xml
+++ b/Content/Items/Shipwrecks/wreckeditems.xml
@@ -185,7 +185,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="windoweddoorwrecked" nameidentifier="windoweddoor" tags="door,weldable" scale="0.5" health="75" category="Wrecked" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" ondamagedthreshold="10">
@@ -223,7 +223,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="hatchwrecked" nameidentifier="hatch" allowedlinks="gap, hull" tags="door,weldable" scale="0.5" health="75" category="Wrecked" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" allowrotatingineditor="false" ondamagedthreshold="10">
@@ -263,7 +263,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="doorwbuttonswrecked" nameidentifier="doorwbuttons" tags="door,weldable" scale="0.5" health="75" requirebodyinsidetrigger="false" category="Wrecked" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" ondamagedthreshold="10">
@@ -303,7 +303,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="windoweddoorwbuttonswrecked" nameidentifier="windoweddoorwbuttons" tags="door,weldable" scale="0.5" health="75" requirebodyinsidetrigger="false" category="Wrecked" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" ondamagedthreshold="10">
@@ -343,7 +343,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="hatchwbuttonswrecked" nameidentifier="hatchwbuttons" allowedlinks="gap, hull" tags="door,weldable" scale="0.5" health="75" requirebodyinsidetrigger="false" category="Wrecked" damagedbyrepairtools="true" damagedbymonsters="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" damagedbyexplosions="true" ShowNameInHealthBar="false" explosiondamagemultiplier="0.1" allowrotatingineditor="false" ondamagedthreshold="10">
@@ -386,7 +386,7 @@
       <RequiredItem items="screwdriver" type="Equipped" />
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="dockingportwrecked" nameidentifier="dockingport" tags="dock" linkable="true" indestructible="true" category="Wrecked">
@@ -397,10 +397,10 @@
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
       <input name="power" displayname="connection.power" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
-      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock" />
-      <output name="on_dock" displayname="connection.ondock" />
-      <output name="on_undock" displayname="connection.onundock" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
+      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock" maxwires=10 />
+      <output name="on_dock" displayname="connection.ondock" maxwires=10 />
+      <output name="on_undock" displayname="connection.onundock" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="dockinghatchwrecked" nameidentifier="dockinghatch" tags="dock" linkable="true" indestructible="true" category="Wrecked">
@@ -411,10 +411,10 @@
       <input name="toggle" displayname="connection.togglestate" />
       <input name="set_state" displayname="connection.setstate" />
       <input name="power" displayname="connection.power" />
-      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" />
-      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock" />
-      <output name="on_dock" displayname="connection.ondock" />
-      <output name="on_undock" displayname="connection.onundock" />
+      <output name="state_out" displayname="connection.stateout" fallbackdisplayname="connection.signalout" maxwires=10 />
+      <output name="proximity_sensor" displayname="connection.dockingproximitysensor" fallbackdisplayname="label.readytodock" maxwires=10 />
+      <output name="on_dock" displayname="connection.ondock" maxwires=10 />
+      <output name="on_undock" displayname="connection.onundock" maxwires=10 />
     </ConnectionPanel>
   </Item>
   <Item name="" identifier="suppliescabinetwrecked" variantof="suppliescabinet" nameidentifier="suppliescabinet" tags="container,suppliescontainer,wrecksupplycab" category="Wrecked">
@@ -435,7 +435,7 @@
   <Item name="" identifier="railgunshellrackwrecked" nameidentifier="railgunshellrack" variantof="railgunshellrack" tags="container,wreckrailgunammocontainer" category="Wrecked">
     <Upgrade gameversion="0.20.4.0" scale="0.5" condition="0" />
     <Sprite texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="936,1869,182,176" />
-    <ItemContainer capacity="6" slotsperrow="6" itempos="28,-100" iteminterval="30,0" />
+    <ItemContainer capacity="18" slotsperrow="5" itempos="28,-100" iteminterval="30,0" />
   </Item>
   <Item name="" identifier="coilgunammoshelfwrecked" nameidentifier="coilgunammoshelf" variantof="coilgunammoshelf" tags="container,wreckammoboxcontainer" category="Wrecked" spritecolor="200,150,100,255">
     <Upgrade gameversion="0.20.4.0" scale="0.5" condition="0" spritecolor="200,150,100,255" />
@@ -455,12 +455,12 @@
     <ItemContainer hideitems="false" drawinventory="true" capacity="1" slotsperrow="1" itempos="0,0" iteminterval="0,0" canbeselected="true" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/Map/LabelIcons.png" sourcerect="512,0,256,256" origin="0.5,0.5" />
-      <Containable items="deepdiving" excludeditems="deepdivinglarge" />
+      <Containable items="deepdiving" />
     </ItemContainer>
   </Item>
   <Item name="" identifier="oxygentankshelf2wrecked" nameidentifier="oxygentankshelf" tags="wreckoxygentankcontainer" pickdistance="50" scale="0.5" category="Wrecked">
     <Sprite name="Diving Suit Locker Small" texture="Content/Items/Shipwrecks/MiscWrecked.png" sourcerect="1126,1964,99,83" depth="0.84" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="3" maxstacksize="1" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="9" maxstacksize="60" slotsperrow="3" itempos="27,-42" iteminterval="22.5,0" itemrotation="0" canbeselected="true" containedspritedepth="0.83" msg="ItemMsgInteractSelect">
       <GuiFrame relativesize="0.16,0.18" anchor="Center" style="ItemUI" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
@@ -543,7 +543,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm01wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1170,1402,85,124" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,528,80,112" origin="0.5,0.5" />
     </LightComponent>
@@ -557,7 +557,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm02wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1258,1401,74,126" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,528,80,112" />
     </LightComponent>
@@ -571,7 +571,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm03wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1335,1401,68,124" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="640,528,64,112" />
     </LightComponent>
@@ -585,7 +585,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentm04wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1407,1400,85,126" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="704,528,80,112" origin="0.5,0.5" />
     </LightComponent>
@@ -599,7 +599,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl01wrecked" category="Wrecked" Tags="largeitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1228,1711,346,90" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,816,240,64" />
     </LightComponent>
@@ -613,7 +613,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightfluorescentl02wrecked" category="Wrecked" Tags="largeitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1169,1650,367,59" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/light_fluorescent_L2.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,896,288,48" />
     </LightComponent>
@@ -627,7 +627,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm01wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1171,1528,76,124" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="480,672,80,128" origin="0.5,0.5" />
     </LightComponent>
@@ -641,7 +641,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm02wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1248,1547,124,77" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="560,672,128,80" origin="0.5,0.5" />
     </LightComponent>
@@ -655,7 +655,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenmm03wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1370,1526,103,123" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="688,672,112,128" />
     </LightComponent>
@@ -669,7 +669,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lighthalogenm04wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1473,1534,124,101" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="800,672,128,96" origin="0.5,0.5" />
     </LightComponent>
@@ -683,7 +683,7 @@
   </Item>
   <Item name="" nameidentifier="lamp" identifier="lightleds01wrecked" category="Wrecked" Tags="smallitem,light" scale="0.5">
     <Sprite texture="MiscWrecked.png" sourcerect="1492,1402,99,99" depth="0.8" origin="0.5,0.5" />
-    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="800.0" LightSpriteScale="1.3" powerconsumption="5">
+    <LightComponent lightcolor="1.0,1.0,1.0,0.5" range="3200" LightSpriteScale="1.3" powerconsumption="5">
       <LightTexture texture="Content/Lights/pointlight_bounce.png" origin="0.5,0.5" />
       <sprite texture="Content/Items/Electricity/signalcomp.png" sourcerect="842,794,59,59" origin="0.5,0.5" />
     </LightComponent>
diff --git a/Content/Items/Tools/tools.xml b/Content/Items/Tools/tools.xml
index 4983107a..712f82de 100644
--- a/Content/Items/Tools/tools.xml
+++ b/Content/Items/Tools/tools.xml
@@ -2,8 +2,8 @@
 <Items>
   <Item name="" identifier="toolbelt" category="Equipment" tags="mediumitem,mobilecontainer,tool" showcontentsintooltip="true" Scale="0.5" fireproof="true" description="" impactsoundtag="impact_soft">
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
     <Deconstruct time="10">
       <Item identifier="organicfiber" />
     </Deconstruct>
@@ -11,11 +11,11 @@
       <Item identifier="organicfiber" amount="2" />
     </Fabricate>
     <Price baseprice="65">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="24" />
       <Price storeidentifier="merchantengineering" minavailable="4" multiplier="0.9"/>
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,576,64,64" origin="0.5,0.5" />
@@ -25,8 +25,8 @@
       <sprite name="ToolBelt" texture="Content/Items/Tools/tools.png" sourcerect="256,102,112,54" limb="Torso" inherittexturescale="true" origin="0.5,-0.2" />
     </Wearable>
     <Holdable slots="RightHand+LeftHand" holdpos="0,-70" handle1="-5,0" handle2="10,-20" holdangle="0" msg="ItemMsgPickUpUse" canbeselected="false" canbepicked="true" pickkey="Use" allowswappingwhenpicked="false" />
-    <ItemContainer capacity="6" maxstacksize="32" depth="0.5" >
-      <Containable items="smallitem" excludeditems="toolbelt,toolbox,bandolier" />
+    <ItemContainer capacity="18" maxstacksize="60" depth="0.5" >
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
@@ -42,11 +42,11 @@
       <Item identifier="organicfiber" amount="5" />
     </Fabricate>
     <Price baseprice="200" minleveldifficulty="50">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" minavailable="6" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" minavailable="18" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="24" />
       <Price storeidentifier="merchantengineering" minavailable="4" multiplier="0.9"/>
     </Price>
     <InventoryIcon texture="Content/Items/Tools/tools.png" sourcerect="3,259,68,110" origin="0.5,0.5" />
@@ -62,8 +62,8 @@
       <StatusEffect type="OnActive" target="Character" SpeedMultiplier="0.7" setvalue="true" disabledeltatime="true" />
       <StatValue stattype="PropulsionSpeed" value="-0.3" />
     </Holdable>
-    <ItemContainer capacity="12" maxstacksize="32" depth="0.5" >
-      <Containable items="smallitem" excludeditems="toolbelt,toolbox,bandolier" />
+    <ItemContainer capacity="36" maxstacksize="60" depth="0.5" >
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
   </Item>
   
@@ -79,11 +79,11 @@
       <Item identifier="steel" amount="2" />
     </Fabricate>
     <Price baseprice="60">
-      <Price storeidentifier="merchantoutpost" minavailable="1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="1" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="4" />
+      <Price storeidentifier="merchantoutpost" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="12" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,256,64,64" origin="0.5,0.6" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="314,1,94,74" origin="0.5,0.5" depth="0.6" />
@@ -99,33 +99,33 @@
         </StatusEffect>
       </Attack>
     </MeleeWeapon>
-    <ItemContainer capacity="12" maxstacksize="32" keepopenwhenequipped="true" movableframe="true" QuickUseMovesItemsInside="false">
-      <Containable items="smallitem" />
+    <ItemContainer capacity="36" maxstacksize="60" keepopenwhenequipped="true" movableframe="true" QuickUseMovesItemsInside="false">
+      <Containable items="smallitem,ammobox,deepdiving,mediumitem,largeitem" />
     </ItemContainer>
     <aitarget sightrange="1000" soundrange="1000" fadeouttime="2" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <!-- the item used to have the (default) 64 max stack size, i.e. stack size was only limited by the max stack size of the contained items -->
     <!-- set the stack size back in old saves/subs to prevent items from dropping from containers -->
-    <Upgrade gameversion="1.1.0.0" maxstacksize="64">
-      <ItemContainer maxstacksize="64" />
+    <Upgrade gameversion="1.1.0.0" maxstacksize="60">
+      <ItemContainer maxstacksize="60" />
     </Upgrade>
   </Item>
   
   <Item name="" identifier="weldingtool" category="Equipment" Tags="smallitem,weldingequipment,tool,mountableweapon" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="2" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="engcab" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer secondary="supplycab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
-    <PreferredContainer primary="outpostsupplycab" amount="1" spawnprobability="0.5"/>
-    <PreferredContainer primary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer primary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="4" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="engcab" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="supplycab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="outpostsupplycab" amount="2" spawnprobability="1"/>
+    <PreferredContainer primary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer primary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.2"/>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchantengineering" minavailable="5" multiplier="0.9"/>
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" origin="0.5,0.5" />
@@ -144,7 +144,7 @@
     <Body width="150" height="60" density="25" />
     <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="60,0" handle1="-62,-16" handle2="-10,-6" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="10.0" structurefixamount="2.0" range="150" barrelpos="35,12" particles="weld" repairmultiple="true" repairthroughwalls="false" combatpriority="3" levelwallfixamount="-0.425" targetforce="10">
+    <RepairTool firedamage="10.0" structurefixamount="2.0" range="600" barrelpos="35,12" particles="weld" repairmultiple="true" repairthroughwalls="true" combatpriority="3" levelwallfixamount="-0.425" targetforce="10">
       <!-- the item must contain a welding fuel tank for it to work -->
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <RequiredSkill identifier="mechanical" level="50" />
@@ -194,13 +194,13 @@
       </LightComponent>
     </RepairTool>
     <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <Containable items="weldingtoolfuel,oxygensource" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
     <Quality>
-      <QualityStat stattype="RepairToolStructureRepairMultiplier" value="0.1"/>
+      <QualityStat stattype="RepairToolStructureRepairMultiplier" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Upgrade gameversion="0.14.0.0">
@@ -215,16 +215,16 @@
   </Item>
   
   <Item name="" identifier="plasmacutter" category="Equipment" Tags="smallitem,cuttingequipment,tool,mountableweapon" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckdivingcab" amount="1" spawnprobability="0.05"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wreckdivingcab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer primary="divingcab" secondary="engcab"/>
     <Price baseprice="150">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" minavailable="2" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchantengineering" minavailable="5" multiplier="0.9"/>
     </Price>
     <Deconstruct time="10">
@@ -240,7 +240,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="0,166,159,87" depth="0.55" origin="0.5,0.5" />
     <Body radius="40" width="60" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="60,0" handle1="-60,-21" handle2="-21,-20" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="10.0" structurefixamount="-0.5" range="150" barrelpos="55,10" combatpriority="5" repairmultiple="true" repairthroughwalls="false" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-5.0" targetforce="10">
+    <RepairTool firedamage="10.0" structurefixamount="-0.5" range="600" barrelpos="55,10" combatpriority="5" repairmultiple="true" repairthroughwalls="true" maxoverlappingwalldist="0.0" repairthroughholes="true" levelwallfixamount="-5.0" targetforce="10">
       <RequiredItems items="oxygensource,weldingtoolfuel" type="Contained" msg="ItemMsgOxygenTankRequired" />
       <RequiredSkill identifier="mechanical" level="50" />
       <StatusEffect type="OnUse" targettype="Contained" targets="oxygensource" Condition="-1.0" />
@@ -276,18 +276,18 @@
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="-5" anglemax="5" velocitymin="0" velocitymax="50" />
       <sound file="Content/Items/Tools/PlasmaCutterLoop.ogg" type="OnUse" range="750.0" loop="true" />
       <Fixable identifier="structure" />
-      <LightComponent LightColor="204,178,255,100" range="150" Flicker="0.5">
+      <LightComponent LightColor="204,178,255,100" range="600" Flicker="0.5">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>      
     </RepairTool>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="0,-39" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="0,-39" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <Containable items="weldingtoolfuel,oxygensource" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
     <Quality>
-      <QualityStat stattype="RepairToolStructureDamageMultiplier" value="0.1"/>
-      <QualityStat stattype="RepairToolDeattachTimeMultiplier" value="0.1"/>
+      <QualityStat stattype="RepairToolStructureDamageMultiplier" value="0.3"/>
+      <QualityStat stattype="RepairToolDeattachTimeMultiplier" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Upgrade gameversion="0.14.0.0">
@@ -298,20 +298,20 @@
     <SkillRequirementHint identifier="mechanical" level="50" />
   </Item>
   
-  <Item name="" identifier="weldingfueltank" category="Equipment,Fuel" health="200" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="weldingfueltank" category="Equipment,Fuel" health="200" maxstacksize="60" maxstacksizecharacterinventory="60" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="weldingtool,flamer" spawnprobability="1"/>
-    <PreferredContainer primary="engcab" minamount="4" maxamount="6" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" minamount="1" maxamount="3" spawnprobability="0.2"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer primary="engcab" minamount="8" maxamount="12" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" minamount="2" maxamount="6" spawnprobability="0.4"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer secondary="supplycab"/>
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" minavailable="6" />
-      <Price storeidentifier="merchantcity" minavailable="7" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="3" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" minavailable="18" />
+      <Price storeidentifier="merchantcity" minavailable="21" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="9" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="45" />
       <Price storeidentifier="merchantengineering" minavailable="10" multiplier="0.9"/>
-      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="3" />
+      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -344,15 +344,15 @@
       </StatusEffect>
     </Holdable>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
-  <Item name="" identifier="incendiumfueltank" category="Equipment,Fuel" health="200" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="incendiumfueltank" category="Equipment,Fuel" health="200" maxstacksize="60" maxstacksizecharacterinventory="60" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,weldingtoolfuel,weldingfuel" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab" secondary="supplycab"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.02"/> 
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.04"/> 
     <Price baseprice="250" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
       <Price storeidentifier="merchantcity" />
@@ -390,21 +390,21 @@
       </StatusEffect>
     </Holdable>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="extinguisher" category="Equipment" Tags="mediumitem,fireextinguisher,provocative" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light" donttransferbetweensubs="true">
     <Upgrade gameversion="0.9.600.0" Tags="mediumitem,fireextinguisher,provocative" />
-    <PreferredContainer primary="extinguisherholder" spawnprobability="1.0"/>
-    <PreferredContainer primary="wreckextinguisherholder" spawnprobability="0.6"/>
+    <PreferredContainer primary="extinguisherholder" spawnprobability="1"/>
+    <PreferredContainer primary="wreckextinguisherholder" spawnprobability="1"/>
     <PreferredContainer secondary="engcab,reactorcab"/>
     <Price baseprice="100" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantresearch" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" minavailable="2" />
-      <Price storeidentifier="merchantmine" minavailable="2" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantresearch" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" minavailable="6" />
+      <Price storeidentifier="merchantmine" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -419,32 +419,32 @@
     <Sprite texture="Content/Items/Tools/tools.png" depth="0.55" sourcerect="161,105,64,128" origin="0.5,0.5" />
     <Body width="30" height="100" density="8" />
     <Holdable slots="RightHand+LeftHand" controlpose="true" aimpos="40,-20" handle1="-6,10" handle2="-10,40" msg="ItemMsgPickUpSelect" />
-    <RepairTool extinguishamount="60.0" range="500" barrelpos="21,25" repairthroughholes="true" hititems="false" IgnoreCharacters="true">
+    <RepairTool extinguishamount="240" range="2000" barrelpos="21,25" repairthroughholes="true" hititems="false" IgnoreCharacters="true">
       <ParticleEmitter particle="extinguisher" velocitymin="1000.0" velocitymax="1650.0" particlespersecond="100" />
-      <StatusEffect type="OnUse" targettype="This" Condition="-2.0" />
+      <StatusEffect type="OnUse" targettype="This" Condition="-0.25" />
       <sound file="Content/Items/Tools/Extinguisher.ogg" type="OnUse" range="500.0" loop="true" />
     </RepairTool>
-    <RepairTool range="500" barrelpos="21,25" IgnoreCharacters="false">
+    <RepairTool range="2000" barrelpos="21,25" IgnoreCharacters="false">
       <!-- Remove 'burning' affliction from characters-->
       <StatusEffect type="OnUse" target="UseTarget">
         <ReduceAffliction identifier="burning" amount="15.0" />
       </StatusEffect>
     </RepairTool>
-    <Propulsion force="-80" usablein="water" particles="bubbles" />
+    <Propulsion force="-240" usablein="water" particles="bubbles" />
     <aitarget sightrange="1000" soundrange="1000" fadeouttime="1" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
 
   <Item name="" identifier="sprayer" category="Equipment" Tags="smallitem,tool,mountableweapon" cargocontaineridentifier="metalcrate" description="" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab" amount="2" spawnprobability="0.2"/>
     <Price baseprice="120">
-      <Price storeidentifier="merchantoutpost" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmine" multiplier="0.9" minavailable="30" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="128,256,64,64" origin="0.5,0.5" />
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="373,165,124,73" depth="0.55" origin="0.5,0.5" />
@@ -487,23 +487,23 @@
       </PaintColors>
     </Sprayer>
     <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="8,-35" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <Containable items="ethanol, paint" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="500" fadeouttime="3" />
   </Item>
   
   <Item name="" identifier="screwdriver" category="Equipment" Tags="smallitem,simpletool,tool,electricalrepairtool,screwdriveritem" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
     <PreferredContainer primary="engcab" secondary="reactorcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.2"/>  
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.5"/>
-    <PreferredContainer primary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.5"/>   
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.3"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-    <Price baseprice="10" minavailable="10">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.4"/>  
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="1"/>
+    <PreferredContainer primary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="1"/>   
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.6"/>
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+    <Price baseprice="10" minavailable="30">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="5"  />
+      <Price storeidentifier="merchantcity" minavailable="15"  />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
@@ -537,21 +537,21 @@
     </MeleeWeapon>
     <aitarget sightrange="500" soundrange="250" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="RepairSpeed" value="0.1"/>
+      <QualityStat stattype="RepairSpeed" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
   <Item name="" identifier="wrench" category="Equipment" Tags="smallitem,tool,simpletool,mechanicalrepairtool,wrenchitem,mountableweapon,deattachtool" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.5"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.3"/>
-    <PreferredContainer secondary="outposttrashcan" amount="1" spawnprobability="0.1" />
-    <Price baseprice="20" minavailable="10">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.6"/>
+    <PreferredContainer secondary="outposttrashcan" amount="2" spawnprobability="0.2" />
+    <Price baseprice="20" minavailable="30">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="5" />
+      <Price storeidentifier="merchantcity" minavailable="15" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
@@ -580,20 +580,20 @@
     </MeleeWeapon>
     <aitarget sightrange="500" soundrange="500" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="RepairSpeed" value="0.1"/>
+      <QualityStat stattype="RepairSpeed" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
   <Item name="" identifier="crowbar" category="Equipment" Tags="smallitem,tool,simpletool,dooropeningtool,crowbaritem,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
     <PreferredContainer primary="engcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.2"/>
-    <Price baseprice="20" minavailable="10">
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer primary="wreckengcab,abandonedengcab,pirateengcab,outpostengcab,beaconengcab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.4"/>
+    <Price baseprice="20" minavailable="30">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="45" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
@@ -621,22 +621,22 @@
     </MeleeWeapon>
     <aitarget sightrange="1000" soundrange="500" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="StrikingPowerMultiplier" value="0.1"/>
+      <QualityStat stattype="StrikingPowerMultiplier" value="0.3"/>
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
   <Item name="" identifier="handheldsonar" category="Equipment,Diving" Tags="smallitem,sonar,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-    <Preferredcontainer secondary="respawncontainer" amount="1" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="divingcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="150" minavailable="1">
+    <Preferredcontainer secondary="respawncontainer" amount="2" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="divingcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="150" minavailable="3">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="copper" />
@@ -675,11 +675,11 @@
       <icon identifier="location" texture="Content/UI/MainIconsAtlas.png" sourcerect="349,435,11,11" origin="0.5,0.5"/>
       <icon identifier="mineral" texture="Content/UI/MainIconsAtlas.png" sourcerect="336,434,7,12" origin="0.5,0.5"/>
       <icon identifier="" texture="Content/UI/MainIconsAtlas.png" sourcerect="346,416,4,4" origin="0.5,0.5"/>
-      <LightComponent LightColor="120,255,120,255" range="25" powerconsumption="10" pulsefrequency="0.5" pulseamount="0.8" castshadows="false" IsOn="false" canbeselected="false">
+      <LightComponent LightColor="120,255,120,255" range="100" powerconsumption="10" pulsefrequency="0.5" pulseamount="0.8" castshadows="false" IsOn="false" canbeselected="false">
         <IsActive TargetItemComponent="Sonar" CurrentMode="Active"/>        
       </LightComponent>
     </Sonar>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -689,15 +689,15 @@
   </Item>
   
   <Item name="" identifier="sonarbeacon" category="Equipment,Diving" Tags="smallitem,sonar,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="divingcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="150" minavailable="1">
+    <PreferredContainer primary="divingcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,wreckdivingcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="150" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="15">
       <Item identifier="copper" />
@@ -713,7 +713,7 @@
     <Body width="27" height="60" density="12" />
     <Holdable slots="Any,RightHand,LeftHand" holdangle="30" handle1="0,-15" msg="ItemMsgPickUpSelect" />
     <AiTarget soundrange="50000" sonarlabel="entityname.sonarbeacon" sight="500" staticsight="true"/>
-    <LightComponent LightColor="0.0,1.0,0.0,1.0" range="50" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
+    <LightComponent LightColor="0.0,1.0,0.0,1.0" range="200" powerconsumption="10" blinkfrequency="2" IsOn="false" canbeselected="false">
       <StatusEffect type="OnActive" targettype="Contained" Condition="-0.1">
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
@@ -730,7 +730,7 @@
       </TickBox>
       <TextBox text="sonarbeacon.beaconsignal" propertyname="SonarLabel" maxtextlength="32"/>
     </CustomInterface>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -738,12 +738,12 @@
     </ItemContainer>
   </Item>
   <Item name="" identifier="flashlight" category="Equipment" Tags="smallitem,tool,provocative" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="divingcab" minamount="1" maxamount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <Price baseprice="200" minavailable="2">
+    <PreferredContainer primary="divingcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab,wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <Price baseprice="200" minavailable="6">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" />
@@ -765,16 +765,16 @@
         <RequiredItem items="mobilebattery" type="Contained" />
       </StatusEffect>
       <!-- the child LightComponent is only active when the Holdable is active, i.e. when the item is being held -->
-      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" Flicker="0.02" range="800" powerconsumption="10" IsOn="true">
+      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" Flicker="0.02" range="3200" powerconsumption="10" IsOn="true">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
         <IsActive targetcontaineditem="true" condition="gt 1.0"/>
       </LightComponent>
-      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" range="800" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
+      <LightComponent LightColor="0.5,0.5,0.5,1.0" directional="true" range="3200" powerconsumption="10" IsOn="true" flicker="0.8" flickerspeed="1.0" pulsefrequency="0.1" pulseamount="0.5">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
         <IsActive targetcontaineditem="true" condition="lte 1.0"/>
       </LightComponent>
     </Holdable>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery">
         <StatusEffect type="OnContaining" targettype="This" Voltage="1.0" setvalue="true" />
@@ -784,17 +784,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   
-  <Item name="" identifier="flare" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
-    <PreferredContainer primary="divingcab" minamount="2" maxamount="5" spawnprobability="1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <Price baseprice="30" minavailable="6">
+  <Item name="" identifier="flare" category="Equipment" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+    <PreferredContainer primary="divingcab" minamount="4" maxamount="10" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <Price baseprice="30" minavailable="18">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" minavailable="10" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="24" />
+      <Price storeidentifier="merchantmine" minavailable="30" />
+      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="24" />
     </Price>
     <Deconstruct time="5"/>      
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="12">
@@ -805,7 +805,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="227,204,54,18" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="15" density="10"/>
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="255,0.0,0.0,255" Flicker="0.5" range="600" IsOn="false">
+    <LightComponent LightColor="255,0.0,0.0,255" Flicker="0.5" range="2400" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -823,11 +823,11 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
     
-  <Item name="" identifier="alienflare" category="Equipment,Alien" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+  <Item name="" identifier="alienflare" category="Equipment,Alien" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
     <PreferredContainer primary="divingcab"/>
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="1" spawnprobability="0.01"/>
-    <PreferredContainer primary="ruinstorage,ruinstoragesmall" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="ruinstoragelarge" minamount="1" maxamount="3" spawnprobability="0.3" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab,wreckstoragecab" amount="2" spawnprobability="0.02"/>
+    <PreferredContainer primary="ruinstorage,ruinstoragesmall" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="ruinstoragelarge" minamount="2" maxamount="6" spawnprobability="0.6" />
     <Price baseprice="200" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
@@ -843,7 +843,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="283,204,54,18" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="15" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="0,162,232,255" Flicker="0.5" range="1000" IsOn="false">
+    <LightComponent LightColor="0,162,232,255" Flicker="0.5" range="4000" IsOn="false">
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
         <sound file="Content/Items/Tools/FlareIgnite.ogg" range="800.0" />
@@ -862,16 +862,16 @@
 
   <Item name="" identifier="flamer" category="Equipment" Tags="smallitem,weapon,gun,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.2"/>
     <PreferredContainer secondary="armcab,weaponholder"/>
     <Price baseprice="105" sold="false">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="1.25" minavailable="3" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="3" />
     </Price>
     <!--<InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" />-->
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,64,64,64" />
@@ -891,7 +891,7 @@
     <Body width="150" height="77" density="25" />
     <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-62,-16" handle2="-11,-6" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="25.0" structurefixamount="0.0" usablein="Air" range="500" barrelpos="35,10" fireprobability="0.1" repairmultiple="true" RepairMultipleWalls="false" repairthroughwalls="false" repairthroughholes="true" combatpriority="50" spread="25" unskilledspread="25">
+    <RepairTool firedamage="25.0" structurefixamount="0.0" usablein="Air" range="2000" barrelpos="35,10" fireprobability="0.1" repairmultiple="true" RepairMultipleWalls="false" repairthroughwalls="true" repairthroughholes="true" combatpriority="50" spread="25" unskilledspread="25">
       <!-- the item must contain a welding fuel tank for it to work -->
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <RequiredSkill identifier="weapons" level="50" />
@@ -969,7 +969,7 @@
       </LightComponent>
     </RepairTool>
     <!-- one welding fuel or oxygen tank can be contained inside the welding tool -->
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="8,-20" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="8,-20" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <Containable items="weldingtoolfuel,oxygensource" />
     </ItemContainer>
@@ -979,10 +979,10 @@
 
   <Item name="" identifier="syringegun" category="Equipment,Medical,Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,gun,mountableweapon" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true"/>
     <PreferredContainer secondary="secarmcab,weaponholder"/>
-    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.05" />
-    <Price baseprice="190" minavailable="1">
+    <PreferredContainer secondary="wreckmedcab,abandonedmedcab,piratemedcab,wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.1" />
+    <Price baseprice="190" minavailable="3">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
@@ -1012,7 +1012,7 @@
       <RequiredSkill identifier="weapons" level="20" />
       <RequiredSkill identifier="medical" level="30" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="4" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe">
+    <ItemContainer capacity="1" maxstacksize="60" itempos="0,25" itemrotation="-90" hideitems="false" containedstateindicatorstyle="syringe">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="384,448,64,64" origin="0.5,0.5" />
       <Containable items="syringe" />
     </ItemContainer>
@@ -1021,26 +1021,26 @@
     <SkillRequirementHint identifier="medical" level="30" />
   </Item>
 
-  <Item name="" identifier="oxygentank" category="Diving,Equipment" health="200" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,oxygensource,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" allowdroppingonswap="true">
+  <Item name="" identifier="oxygentank" category="Diving,Equipment" health="200" maxstacksize="60" maxstacksizecharacterinventory="60" MaxStackSizeHoldableOrWearableInventory="1" Tags="smallitem,oxygensource,refillableoxygensource" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" allowdroppingonswap="true">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="75">
-      <Price storeidentifier="merchantoutpost" minavailable="10"/>
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantresearch" minavailable="10"/>
-      <Price storeidentifier="merchantmilitary" minavailable="10"/>
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="20" />
+      <Price storeidentifier="merchantoutpost" minavailable="30"/>
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="45" />
+      <Price storeidentifier="merchantresearch" minavailable="30"/>
+      <Price storeidentifier="merchantmilitary" minavailable="30"/>
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="60" />
     </Price>
-    <PreferredContainer secondary="respawncontainer" amount="8" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer primary="oxygentankcontainer" amount="3" spawnprobability="1"/>
+    <PreferredContainer secondary="respawncontainer" amount="16" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer primary="oxygentankcontainer" amount="6" spawnprobability="1"/>
     <PreferredContainer primary="oxygengenerator" maxcondition="75"/>
-    <PreferredContainer primary="divingmask,plasmacutter,deepdiving" spawnprobability="1.0" mincondition="25"/>
-    <PreferredContainer secondary="divingcab" minamount="3" maxamount="5" spawnprobability="1" mincondition="25" notcampaign="true"/>
-    <PreferredContainer secondary="supplycab" amount="1" spawnprobability="0.5" mincondition="25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="outpostsupplycab" minamount="1" maxamount="3" spawnprobability="0.5"/>
-    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="wreckoxygentankcontainer" minamount="1" maxamount="3" spawnprobability="0.3"/>
-    <PreferredContainer secondary="outpostcrewcabinet" minamount="1" maxamount="3" spawnprobability="0.2"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="1" maxamount="3" spawnprobability="0.1"/>
+    <PreferredContainer primary="divingmask,plasmacutter,deepdiving" spawnprobability="1" mincondition="25"/>
+    <PreferredContainer secondary="divingcab" minamount="6" maxamount="10" spawnprobability="1" mincondition="25" notcampaign="true"/>
+    <PreferredContainer secondary="supplycab" amount="2" spawnprobability="1" mincondition="25" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="outpostsupplycab" minamount="2" maxamount="6" spawnprobability="1"/>
+    <PreferredContainer secondary="wrecksupplycab,beaconsupplycab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="wreckoxygentankcontainer" minamount="2" maxamount="6" spawnprobability="0.6"/>
+    <PreferredContainer secondary="outpostcrewcabinet" minamount="2" maxamount="6" spawnprobability="0.4"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" minamount="2" maxamount="6" spawnprobability="0.2"/>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
     </Deconstruct>
@@ -1065,22 +1065,22 @@
       </StatusEffect>
     </Holdable>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
 
-  <Item name="" identifier="oxygenitetank" category="Diving,Equipment" maxstacksize="8" maxstacksizecharacterinventory="1" MaxStackSizeHoldableOrWearableInventory="1" health="400" Tags="smallitem,oxygensource" description="" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="oxygenitetank" category="Diving,Equipment" maxstacksize="60" maxstacksizecharacterinventory="60" MaxStackSizeHoldableOrWearableInventory="1" health="400" Tags="smallitem,oxygensource" description="" scale="0.5" impactsoundtag="impact_metal_light">
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <Price baseprice="175" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" sold="false" />
       <Price storeidentifier="merchantcity" sold="false" multiplier="0.9" />
       <Price storeidentifier="merchantresearch" sold="false" />
       <Price storeidentifier="merchantmilitary" sold="false" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="1"/>
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="3"/>
     </Price>
     <PreferredContainer primary="oxygentankcontainer"/>
-    <PreferredContainer secondary="wrecksupplycab" amount="1" spawnprobability="0.02"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wrecksupplycab" amount="2" spawnprobability="0.04"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
       <Item identifier="liquidoxygenite" mincondition="0.1" />
@@ -1113,24 +1113,24 @@
       </StatusEffect>
     </Holdable>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
 
-  <Item name="" identifier="fuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" scale="0.5">
+  <Item name="" identifier="fuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="60" cargocontaineridentifier="metalcrate" scale="0.5">
     <PreferredContainer primary="reactorcab"/>
-    <PreferredContainer secondary="nucleargun" minamount="1" maxamount="1" spawnprobability="1"/>
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" minamount="1" maxamount="2" spawnprobability="0.5"/>
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.05"/>
-    <Price baseprice="150" displaynonempty="true" minavailable="2">
+    <PreferredContainer secondary="nucleargun" minamount="2" maxamount="2" spawnprobability="1"/>
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" minamount="2" maxamount="4" spawnprobability="1"/>
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.1"/>
+    <Price baseprice="150" displaynonempty="true" minavailable="6">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" minavailable="3" />
+      <Price storeidentifier="merchantcity" minavailable="9" />
       <Price storeidentifier="merchantresearch" />
       <Price storeidentifier="merchantmilitary" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="5" />
-      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="3" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchanttutorial" multiplier="0.5" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1163,22 +1163,22 @@
       </StatusEffect>
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
 
-  <Item name="" identifier="fulguriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
+  <Item name="" identifier="fulguriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="60" cargocontaineridentifier="metalcrate" health="150" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.2"/>
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="0.4"/>
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="250" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
       <Price storeidentifier="merchantcity" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" multiplier="1.25" />
       <Price storeidentifier="merchantmine" multiplier="1.1" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1207,22 +1207,22 @@
       </StatusEffect>
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
 
-  <Item name="" identifier="thoriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="8" cargocontaineridentifier="metalcrate" health="200" scale="0.5">
+  <Item name="" identifier="thoriumfuelrod" Category="Fuel" Tags="smallitem,reactorfuel,divingsuitfuel" maxstacksize="60" cargocontaineridentifier="metalcrate" health="200" scale="0.5">
     <PreferredContainer primary="reactorcab" />
-    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="1" spawnprobability="0.1"/>
-    <PreferredContainer secondary="beaconengcab" amount="1" spawnprobability="0.02"/>
-    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckreactorcab,abandonedreactorcab,piratereactorcab" amount="2" spawnprobability="0.2"/>
+    <PreferredContainer secondary="beaconengcab" amount="2" spawnprobability="0.04"/>
+    <PreferredContainer secondary="abandonedengcab,pirateengcab,wreckengcab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="200" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" sold="false" />
-      <Price storeidentifier="merchantcity" minavailable="1" />
+      <Price storeidentifier="merchantcity" minavailable="3" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
       <Price storeidentifier="merchantmilitary" sold="false" multiplier="1.25" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantengineering" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1256,16 +1256,16 @@
       </StatusEffect>
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="Condition" value="0.1"/>
+      <QualityStat stattype="Condition" value="0.3"/>
     </Quality>
   </Item>
 
-  <redpaint name="" identifier="redpaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,0,0,255" InventoryIconColor="255,0,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <redpaint name="" identifier="redpaint" category="Misc" maxstacksize="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,0,0,255" InventoryIconColor="255,0,0,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="140" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantresearch" multiplier="1.2" />
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="1.2" />
@@ -1294,12 +1294,12 @@
     </Throwable>
   </redpaint>
 
-  <greenpaint name="" identifier="greenpaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,128,0,255" InventoryIconColor="0,255,0,255" scale="0.5" impactsoundtag="impact_metal_light"  impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <greenpaint name="" identifier="greenpaint" category="Misc" maxstacksize="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,128,0,255" InventoryIconColor="0,255,0,255" scale="0.5" impactsoundtag="impact_metal_light"  impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantresearch" multiplier="1.2" />
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="1.2" />
@@ -1328,12 +1328,12 @@
     </Throwable>
   </greenpaint>
 
-  <bluepaint name="" identifier="bluepaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,0,128,255" InventoryIconColor="0,0,255,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <bluepaint name="" identifier="bluepaint" category="Misc" maxstacksize="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="0,0,128,255" InventoryIconColor="0,0,255,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantresearch" multiplier="1.2" />
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="1.2" />
@@ -1362,12 +1362,12 @@
     </Throwable>
   </bluepaint>
 
-  <blackpaint name="" identifier="blackpaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="20,20,20,255" InventoryIconColor="20,20,20,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <blackpaint name="" identifier="blackpaint" category="Misc" maxstacksize="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="20,20,20,255" InventoryIconColor="20,20,20,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantresearch" multiplier="1.2" />
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="1.2" />
@@ -1396,12 +1396,12 @@
     </Throwable>
   </blackpaint>
 
-  <whitepaint name="" identifier="whitepaint" category="Misc" maxstacksize="8" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,128,128,255" InventoryIconColor="128,128,128,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
-    <PreferredContainer secondary="storagecab" minamount="1" maxamount="2" spawnprobability="0.25" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.1" />
+  <whitepaint name="" identifier="whitepaint" category="Misc" maxstacksize="60" cargocontaineridentifier="chemicalcrate" description="" Tags="smallitem,paint" spritecolor="128,128,128,255" InventoryIconColor="128,128,128,255" scale="0.5" impactsoundtag="impact_metal_light" impacttolerance="6">
+    <PreferredContainer secondary="storagecab" minamount="2" maxamount="4" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.2" />
     <Price baseprice="90" minleveldifficulty="5">
       <Price storeidentifier="merchantoutpost" multiplier="1.1" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantresearch" multiplier="1.2" />
       <Price storeidentifier="merchantmilitary" multiplier="1.2" />
       <Price storeidentifier="merchantmine" multiplier="1.2" />
@@ -1432,8 +1432,8 @@
   
   <Item name="" identifier="flamerunique" category="Equipment" Tags="smallitem,weapon,gun,mountableweapon" cargocontaineridentifier="metalcrate" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0.02"/>
-    <PreferredContainer secondary="wreckarmcab" spawnprobability="0.05"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" spawnprobability="0.04"/>
+    <PreferredContainer secondary="wreckarmcab" spawnprobability="0.1"/>
     <Price baseprice="755" sold="false" canbespecial="false" />
     <InventoryIcon texture="Content/Items/InventoryIconAtlas2.png" sourcerect="384,256,62,64" />
     <Sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="263,193,150,87" depth="0.55" origin="0.5,0.5" />
@@ -1443,7 +1443,7 @@
     </Deconstruct>
     <Body width="150" height="77" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" aimpos="50,0" handle1="-55,-20" handle2="-15,-10" msg="ItemMsgPickUpSelect" />
-    <RepairTool firedamage="20.0" structurefixamount="0.0" range="500" barrelpos="35,10" fireprobability="0.0" repairmultiple="true" repairthroughwalls="false" repairthroughholes="true" combatpriority="60" spread="25" unskilledspread="25">
+    <RepairTool firedamage="20.0" structurefixamount="0.0" range="2000" barrelpos="35,10" fireprobability="0.0" repairmultiple="true" repairthroughwalls="true" repairthroughholes="true" combatpriority="60" spread="25" unskilledspread="25">
       <RequiredItems items="weldingtoolfuel,oxygensource" type="Contained" msg="ItemMsgWeldingFuelRequired" />
       <RequiredSkill identifier="weapons" level="40" />
       <ParticleEmitterHitCharacter particle="fleshsmoke" particlespersecond="3" anglemin="265" anglemax="275" velocitymin="0" velocitymax="50" />
@@ -1494,7 +1494,7 @@
         <Affliction identifier="burn" strength="5.0" probability="0.5"/>
       </StatusEffect>
     </RepairTool>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" itempos="11,-15" containedspritedepth="0.56" containedstateindicatorstyle="tank">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" itempos="11,-15" containedspritedepth="0.56" containedstateindicatorstyle="tank">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,448,64,64" origin="0.5,0.5" />
       <Containable items="weldingtoolfuel,oxygensource" />
     </ItemContainer>
@@ -1502,16 +1502,16 @@
     <SkillRequirementHint identifier="weapons" level="40" />
   </Item>
 
-  <Item name="" identifier="glowstick" category="Equipment" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
-    <PreferredContainer primary="divingcab" minamount="3" maxamount="5" spawnprobability="1" notcampaign="true"/>
-    <PreferredContainer secondary="outpostcrewcabinet" amount="1" spawnprobability="0.1"/>
-    <Price baseprice="45" minavailable="6" displaynonempty="true">
+  <Item name="" identifier="glowstick" category="Equipment" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,light,provocative" impactsoundtag="impact_soft" isshootable="true" damagedbymonsters="true" health="10">
+    <PreferredContainer primary="divingcab" minamount="6" maxamount="10" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="outpostcrewcabinet" amount="2" spawnprobability="0.2"/>
+    <Price baseprice="45" minavailable="18" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" />
-      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantcity" multiplier="0.9" minavailable="30" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantmine" minavailable="10" />
-      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="8" />
+      <Price storeidentifier="merchantmilitary" multiplier="1.25" minavailable="24" />
+      <Price storeidentifier="merchantmine" minavailable="30" />
+      <Price storeidentifier="merchantarmory" multiplier="1.25" minavailable="24" />
     </Price>
     <Deconstruct time="5"/>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="4">
@@ -1522,7 +1522,7 @@
     <Sprite texture="Content/Items/Tools/tools.png" sourcerect="278,157,50,9" depth="0.55" origin="0.5,0.5" />
     <Body width="50" height="9" density="10" />
     <Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" holdangle="90" throwforce="2.0" aimpos="35,-10" msg="ItemMsgPickUpSelect" />
-    <LightComponent LightColor="50,255,50,255" Flicker="0.0" range="400" IsOn="false">
+    <LightComponent LightColor="50,255,50,255" Flicker="0.0" range="1600" IsOn="false">
       <sprite texture="Content/Items/Tools/tools.png" sourcerect="374,140,62,20" alpha="1.0" origin="0.5,0.5" />
       <StatusEffect type="OnUse" targettype="This" IsOn="true" DontCleanUp="True">
         <Conditional IsOn="eq False" targetitemcomponent="LightComponent" />
diff --git a/Content/Items/Weapons/chaingun.xml b/Content/Items/Weapons/chaingun.xml
index 2ba8fe88..cdd95981 100644
--- a/Content/Items/Weapons/chaingun.xml
+++ b/Content/Items/Weapons/chaingun.xml
@@ -30,7 +30,7 @@
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <ChargeSound file="Content/Items/Weapons/CHAINGUN_chargeUp_loop.ogg" volume="2" range="10000"/>
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashchaingun" particleamount="1" velocitymin="0" velocitymax="0" distancemin="-50" distancemax="-50" />
@@ -82,7 +82,7 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="75,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="60" slotsperrow="6" itempos="75,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="chaingunammo" />
       <!-- when the chaingun is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
@@ -94,31 +94,31 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="contained_conditions" displayname="connection.ammunitionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="contained_conditions" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
 
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>
@@ -215,18 +215,18 @@
   </Item>
 
   <Item name="" identifier="chaingunammobox" scale="0.5" tags="chaingunequipment,chaingunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="chaingunammosource" amount="1" mincondition="1"/>
+    <PreferredContainer primary="chaingunammosource" amount="2" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <!--Ensure that Thalamus always has at least one ammo box to use-->
-    <PreferredContainer secondary="wreckchaingunloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.2"/>
-    <Price baseprice="180" minavailable="1" displaynonempty="true">
+    <PreferredContainer secondary="wreckchaingunloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.4"/>
+    <Price baseprice="180" minavailable="3" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -260,15 +260,15 @@
 
   <Item name="" identifier="chaingunammoboxphysicorium" fallbacknameidentifier="chaingunammobox" scale="0.5" tags="chaingunequipment,chaingunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="chaingunammosource,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckchaingunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckchaingunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="410" sold="false" displaynonempty="true" minleveldifficulty="35">
       <Price storeidentifier="merchantoutpost" multiplier="1.3"/>
       <Price storeidentifier="merchantcity" multiplier="1.2"/>
       <Price storeidentifier="merchantresearch" multiplier="1.3"/>
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1"/>
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="3"/>
       <Price storeidentifier="merchantmine" multiplier="1.2"/>
-      <Price storeidentifier="merchantarmory" sold="true"  multiplier="0.9" minavailable="1"/>
+      <Price storeidentifier="merchantarmory" sold="true"  multiplier="0.9" minavailable="3"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="physicorium" mincondition="0.95" />
@@ -305,15 +305,15 @@
 
   <Item name="" identifier="chaingunammoboxshredder" scale="0.5" tags="chaingunequipment,chaingunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="chaingunammosource,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckchaingunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckchaingunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="300" minavailable="0" displaynonempty="true" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
diff --git a/Content/Items/Weapons/coilgun.xml b/Content/Items/Weapons/coilgun.xml
index 68a3a2e6..c56768c0 100644
--- a/Content/Items/Weapons/coilgun.xml
+++ b/Content/Items/Weapons/coilgun.xml
@@ -29,7 +29,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -77,7 +77,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashcoilgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -126,7 +126,7 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="82,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="60" slotsperrow="6" itempos="82,-270" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="coilgunammo" />
       <!-- when the coilgun is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
@@ -138,31 +138,31 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="contained_conditions" displayname="connection.ammunitionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="contained_conditions" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
     
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.79" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.79" alpha="1.0" />       
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.79" alpha="1.0" />   
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.79" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.79" alpha="1.0" />       
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.79" alpha="1.0" />     
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>
@@ -283,18 +283,18 @@
   </Item>
 
   <Item name="" identifier="coilgunammobox" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="coilgunammoloader" amount="2" mincondition="1"/>
-    <PreferredContainer primary="ammoboxcontainer" amount="2" mincondition="1"/>
+    <PreferredContainer primary="coilgunammoloader" amount="4" mincondition="1"/>
+    <PreferredContainer primary="ammoboxcontainer" amount="4" mincondition="1"/>
     <!--Ensure that Thalamus always has at least one coilgun ammo box to use-->
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.5"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="1"/>
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3"/>
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="6" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="3"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="3"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15"/>
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="9"/>
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="18" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="9"/>
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="45"/>
+      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="9"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="45"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -315,7 +315,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="6" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -331,8 +331,8 @@
   </Item>
   <Item name="" identifier="physicoriumammobox" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="330" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2"/>
@@ -363,7 +363,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="6" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -379,8 +379,8 @@
   </Item>
   <Item name="" identifier="coilgunammoboxexplosive" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="350" sold="false" displaynonempty="true" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
@@ -411,7 +411,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="6" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -427,15 +427,15 @@
   </Item>
   <Item name="" identifier="coilgunammoboxpiercing" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="260" displaynonempty="true" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" minleveldifficulty="5"/>
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="24" minleveldifficulty="5"/>
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="8" minleveldifficulty="5"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="24" minleveldifficulty="5"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -458,7 +458,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="6" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!-- we cheat a bit with ammunition boxes - they don't actually contain hundreds of rounds, 
       but spawn a new round every time the OnUse effect is triggered. OnUse also reduces the condition
       of the item, and when the condition is 0, the box is considered empty. -->
@@ -475,14 +475,14 @@
   
   <Item name="" identifier="coilgunharpoonbox" scale="0.5" tags="coilgunequipment,coilgunammo,ammobox,noammobelt" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="coilgunammoloader,ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckcoilgunloader" amount="1" spawnprobability="0.05"/>
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckcoilgunloader" amount="2" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="120" displaynonempty="true">
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="2"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="2"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3"/>
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="6"/>
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9"/>
+      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="6"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9"/>
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="25"/>
@@ -505,7 +505,7 @@
     <Holdable canbecombined="true" removeoncombined="false" slots="RightHand,LeftHand" holdpos="0,-30" handle1="0,-30" aimable="false" msg="ItemMsgPickUpSelect">
       <StatValue stattype="MovementSpeed" value="-0.2" />
     </Holdable>
-    <ItemContainer hideitems="true" capacity="2" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
+    <ItemContainer hideitems="true" capacity="6" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <!--  -35 per usage = 3 shots per box -->
       <StatusEffect type="OnUse" target="This" disabledeltatime="true">
         <SpawnItem identifiers="coilgunharpoon" spawnposition="ThisInventory" />
diff --git a/Content/Items/Weapons/depthcharge.xml b/Content/Items/Weapons/depthcharge.xml
index b327d6f2..0008cb78 100644
--- a/Content/Items/Weapons/depthcharge.xml
+++ b/Content/Items/Weapons/depthcharge.xml
@@ -16,7 +16,7 @@
       <ItemContainer canbepicked="true" pickkey="Use" />
     </Upgrade>
     <Sprite texture="TurretsAndDepthCharges.png" depth="0.8" sourcerect="354,2,125,188" origin="0.5,0.5" />
-    <ItemContainer hideitems="false" autointeractwithcontained="true" autointeractwithcontainedtags="autointeractabledepthchargeammo" drawinventory="true" capacity="1" maxstacksize="1" itempos="62,-117" itemrotation="-90" 
+    <ItemContainer hideitems="false" autointeractwithcontained="true" autointeractwithcontainedtags="autointeractabledepthchargeammo" drawinventory="true" capacity="1" maxstacksize="60" itempos="62,-117" itemrotation="-90" 
                    canbeselected="true" canbepicked="true" pickkey="Use" msg="ItemMsgInteractSelect">
       <!-- the loader can't be "picked" in the sense of picking it up, the picking action is just defined to relay the Use input to the contained boarding pod -->
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
@@ -25,18 +25,18 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="contained_items" displayname="connection.ammunitionout" />
+      <output name="contained_items" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
   </Item>
 
   <Item name="" identifier="depthchargeshell" tags="depthchargeammo,demolitionsexpert" category="Weapon" sonarsize="5" scale="0.4" impactsoundtag="impact_metal_heavy" damagedbymonsters="true" damagedbyexplosions="true" damagedbyrepairtools="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" indestructible="true" health="10" cargocontaineridentifier="">
     <Upgrade gameversion="0.20.4.0" scale="0.4"/>
     <PreferredContainer primary="depthchargeloader" secondary="ammoboxcontainer" />
-    <Price baseprice="120" minavailable="1">
+    <Price baseprice="120" minavailable="3">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
     </Price>
     <Deconstruct time="10">
@@ -82,14 +82,14 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem,explosive" />
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
@@ -100,7 +100,7 @@
       <Price storeidentifier="merchantoutpost" multiplier="1.35" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="3" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
     </Price>
     <Deconstruct time="20">
@@ -160,14 +160,14 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" containedstateindicatorstyle="explosive" containedspritedepth="0.81" />
       <Containable items="smallitem,explosive" />
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
 
@@ -196,7 +196,7 @@
   <Item name="" identifier="depthdecoyshell" tags="depthchargeammo,decoy" category="Weapon" sonarsize="5" scale="0.4" impactsoundtag="impact_metal_heavy" damagedbymonsters="true" damagedbyexplosions="true" damagedbyrepairtools="true" damagedbyprojectiles="true" damagedbymeleeweapons="true" health="200" indestructible="true" cargocontaineridentifier="">
     <Upgrade gameversion="0.20.4.0" scale="0.4"/>
     <PreferredContainer primary="depthchargeloader" secondary="ammoboxcontainer" />
-    <Price baseprice="180" minavailable="2">
+    <Price baseprice="180" minavailable="6">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
@@ -240,19 +240,19 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="700" PowerConsumption="0" IsOn="false">
+    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="2800" PowerConsumption="0" IsOn="false">
       <LightTexture texture="Content/Lights/pointlight_falloff.png" />
       <Sound file="Content/Items/Weapons/SonarDecoy.ogg" type="OnActive" range="20000" loop="true" dontmuffle="true" />
       <StatusEffect type="OnActive" target="This" setvalue="true" soundrange="10000" sightrange="6000"/>
     </LightComponent>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem,explosive" />
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
@@ -263,7 +263,7 @@
       <Price storeidentifier="merchantoutpost" multiplier="1.35" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="3" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
     </Price>
     <Deconstruct time="20">
@@ -324,19 +324,19 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="700" PowerConsumption="0" IsOn="false">
+    <LightComponent LightColor="0,255,100,200" PulseFrequency="1.0" PulseAmount="0.8" Flicker="0.3" FlickerSpeed="3.0" range="2800" PowerConsumption="0" IsOn="false">
       <LightTexture texture="Content/Lights/pointlight_falloff.png" />
       <Sound file="Content/Items/Weapons/SonarDecoy.ogg" type="OnActive" range="20000" loop="true" dontmuffle="true" />
       <StatusEffect type="OnActive" target="This" setvalue="true" soundrange="10000" sightrange="6000"/>
     </LightComponent>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem,explosive" />
     </ItemContainer>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
 
@@ -363,8 +363,8 @@
   <Item name="" identifier="boardingpod" tags="depthchargeammo,autointeractabledepthchargeammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="" AllowDeselectWhenIdling="false">
     <PreferredContainer primary="depthchargeloader" />
     <Price baseprice="170" sold="false">
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="6" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="18" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -412,7 +412,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false">
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem" />
     </ItemContainer>
@@ -428,11 +428,11 @@
       <limbposition limb="LeftFoot" position="74,-40" />
       <StatusEffect type="OnActive" targettype="Character" delay="0.25" stackable="true" indetectable="true" DisableFocusingOnEntities="true" invisibletimer="0.1" IgnoreMeleeWeapons="true" PressureProtection="6500.0" setvalue="true" />
       <!-- child of the Controller = active when someone's using it -->
-      <LightComponent range="100" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
+      <LightComponent range="400" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
         <Sprite texture="Content/Items/Weapons/TurretsAndDepthCharges.png" sourcerect="700,55,33,30" depth="0.54" origin="2.1,0.5" alpha="1.0" />
         <IsActiveConditional ContainerIdentifier="! depthchargeloader"/>
       </LightComponent>
-      <LightComponent range="100" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
+      <LightComponent range="400" PowerConsumption="0" lightcolor="150,255,150,0" blinkfrequency="1" AllowInGameEditing="false" IsOn="true">
         <Sprite texture="Content/Items/Weapons/TurretsAndDepthCharges.png" sourcerect="700,55,33,30" depth="0.54" origin="0.5,0.0" alpha="1.0" />
         <IsActiveConditional ContainerIdentifier="depthchargeloader"/>
       </LightComponent>
diff --git a/Content/Items/Weapons/explosives.xml b/Content/Items/Weapons/explosives.xml
index fee93185..1e1e2c33 100644
--- a/Content/Items/Weapons/explosives.xml
+++ b/Content/Items/Weapons/explosives.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="uex" category="Weapon" description="" Scale="0.5" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="uex" category="Weapon" description="" Scale="0.5" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2"/>
     <PreferredContainer secondary="armcab"/>
-    <Price baseprice="95" minavailable="4" minleveldifficulty="5">
-      <Price storeidentifier="merchantoutpost" multiplier="1.4" minavailable="2" />
+    <Price baseprice="95" minavailable="12" minleveldifficulty="5">
+      <Price storeidentifier="merchantoutpost" multiplier="1.4" minavailable="6" />
       <Price storeidentifier="merchantcity" multiplier="1.25" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="3" />
       <Price storeidentifier="merchantmilitary" multiplier="0.9" />
       <Price storeidentifier="merchantmine" />
       <Price storeidentifier="merchantarmory" multiplier="0.9" minleveldifficulty="0" />
@@ -40,23 +40,23 @@
       </StatusEffect>
     </Throwable>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
-  <Item name="" identifier="c4block" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="c4block" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="60" maxstacksizecharacterinventory="60" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="160">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="70" />
@@ -85,22 +85,22 @@
       </StatusEffect>
     </Throwable>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
-  <Item name="" identifier="compoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="compoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="60" maxstacksizecharacterinventory="60" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4"/>
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="medicalfabricator" requiredtime="20">
       <RequiredSkill identifier="medical" level="60" />
@@ -131,15 +131,15 @@
       </StatusEffect>
     </Throwable>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
-  <Item name="" identifier="volatilecompoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" impacttolerance="2" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="volatilecompoundn" category="Weapon,Material" Tags="smallitem,explosive,demolitionsexpert" impacttolerance="2" maxstacksize="60" maxstacksizecharacterinventory="60" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="250" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
@@ -177,23 +177,23 @@
       </StatusEffect>
     </Throwable>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
-  <Item name="" identifier="ic4block" description="" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="32" maxstacksizecharacterinventory="8" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
+  <Item name="" identifier="ic4block" description="" category="Weapon" Tags="smallitem,explosive,demolitionsexpert" maxstacksize="60" maxstacksizecharacterinventory="60" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_soft">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.02"/>
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.04"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="400" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
       <Price storeidentifier="merchantcity" multiplier="1.25"/>
       <Price storeidentifier="merchantresearch" multiplier="1.25"/>
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="3" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="960,69,64,56" origin="0.5,0.5" />
     <Sprite texture="weapons_new.png" depth="0.55" sourcerect="204,476,50,34" origin="0.5,0.5" />
@@ -225,24 +225,24 @@
       </StatusEffect>
     </Throwable>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1"/>
-      <QualityStat stattype="ExplosionDamage" value="0.1"/>
+      <QualityStat stattype="ExplosionRadius" value="0.3"/>
+      <QualityStat stattype="ExplosionDamage" value="0.3"/>
     </Quality>
   </Item>
   
   <Item name="" identifier="detonator" description="" health="30" category="Equipment,Weapon" Tags="smallitem,detonator" DamagedByContainedItemExplosions="true" explosiondamagemultiplier="0.3" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light" isshootable="true">
     <Upgrade gameversion="0.9.3.0" scale="0.5"/>
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.5" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.1"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="100">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantengineering" multiplier="1.2" minavailable="1" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantengineering" multiplier="1.2" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,64,64,64" origin="0.5,0.5" />
     <Sprite texture="weapons_new.png" depth="0.55" sourcerect="215,242,41,21" origin="0.5,0.5" />
@@ -260,12 +260,12 @@
     <Holdable selectkey="Action" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
       <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
     </Holdable>
-    <ItemContainer canbeselected="true" capacity="1" maxstacksize="1" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer canbeselected="true" capacity="1" maxstacksize="60" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.11,0.17" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="explosive" />
     </ItemContainer>
-    <LightComponent LightColor="248,81,81,80" range="20" powerconsumption="0" IsOn="false" blinkfrequency="4.0" offset="13,0" castshadows="false" allowingameediting="false">
+    <LightComponent LightColor="248,81,81,80" range="80" powerconsumption="0" IsOn="false" blinkfrequency="4.0" offset="13,0" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/weapons_new.png" depth="0.55" sourcerect="239,243,14,18" origin="-0.24,0.5" alpha="1.0"/>
       <StatusEffect type="Always" target="This" IsOn="false" checkconditionalalways="true">
         <Conditional attached="false" targetitemcomponentname="Holdable"/>
@@ -292,17 +292,17 @@
   </Item>
 
   <Item identifier="timeddetonator" health="30" description="" category="Equipment,Weapon" Tags="smallitem,detonator" DamagedByContainedItemExplosions="true" explosiondamagemultiplier="0.3" Scale="0.5" cargocontaineridentifier="explosivecrate" impactsoundtag="impact_metal_light" isshootable="true">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.1" notcampaign="true" notpvp="true"/>
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="0.2" notcampaign="true" notpvp="true"/>
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.02"/>
     <PreferredContainer secondary="armcab"/>
     <Price baseprice="110" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="2" />
-      <Price storeidentifier="merchantengineering" sold="true" multiplier="1.2" minavailable="1" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantengineering" sold="true" multiplier="1.2" minavailable="3" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,64,64,64" origin="0.5,0.5" /><!-- TODO new InventoryIcon and Sprite-->
     <Sprite texture="weapons_new.png" depth="0.55" sourcerect="215,242,41,21" origin="0.5,0.5" />
@@ -317,22 +317,22 @@
     </Deconstruct>
     <Body width="40" height="22" density="20" />
     <Holdable selectkey="Action" pickkey="Use" slots="Any,RightHand,LeftHand" msg="ItemMsgDetachWrench" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
-      <RequiredItem items="wrench,deattachtool" excludeditems="multitool" type="Equipped" />
+      <RequiredItem items="wrench,deattachtool" type="Equipped" />
       <StatusEffect target="This" type="Always">
         <Conditional attached="false" targetitemcomponentname="Holdable"/>
         <Use />
       </StatusEffect>
     </Holdable>
-    <ItemContainer canbeselected="true" capacity="1" maxstacksize="1" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer canbeselected="true" capacity="1" maxstacksize="60" itempos="20,-11" hideitems="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.11,0.17" anchor="CenterLeft" pivot="BottomLeft" relativeoffset="0.006,0.016" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="explosive">
         <StatusEffect type="OnRemoved" target="This" targetitemcomponent="LightComponent" blinkfrequency="1.0" IsOn="false" setvalue="true"/>    
       </Containable>
     </ItemContainer>
-    <PowerContainer capacity="60" Charge="8" canbeselected="false">
+    <PowerContainer capacity="50" Charge="8" canbeselected="false">
     </PowerContainer>
-    <LightComponent LightColor="248,81,81,80" range="20" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="13,0" castshadows="false" allowingameediting="false">
+    <LightComponent LightColor="248,81,81,80" range="80" powerconsumption="0" IsOn="false" blinkfrequency="1.0" offset="13,0" castshadows="false" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/weapons_new.png" depth="0.55" sourcerect="239,243,14,18" origin="-0.24,0.5" alpha="1.0"/>
       <!-- Detonator active, do the countdown -->
       <StatusEffect type="OnActive" target="This" targetitemcomponent="PowerContainer" Charge="-1.0" interval="1" disabledeltatime="true" CheckConditionalAlways="true">
@@ -368,16 +368,16 @@
     </ConnectionPanel>
   </Item>
   
-  <Item name="" identifier="nitroglycerin" category="Material,Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" description="" spritecolor="1.0,1.0,1.0,1.0" containercolor="1.0,1.0,1.0,1.0" cargocontaineridentifier="explosivecrate" Tags="smallitem,chem,explosive" impacttolerance="6" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="nitroglycerin" category="Material,Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" description="" spritecolor="1.0,1.0,1.0,1.0" containercolor="1.0,1.0,1.0,1.0" cargocontaineridentifier="explosivecrate" Tags="smallitem,chem,explosive" impacttolerance="6" useinhealthinterface="true" scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="secarmcab" secondary="armcab"/>
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.02"/>
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="640,768,64,64" origin="0.5,0.5" />
     <Sprite texture="weapons_new.png" sourcerect="110,414,31,62" depth="0.55" origin="0.5,0.5" />
@@ -406,7 +406,7 @@
 
   <Item name="" identifier="volatilenitroglycerin" variantof="nitroglycerin" Tags="smallitem" impacttolerance="3">
     <PreferredContainer />
-    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0"/>
+    <PreferredContainer secondary="wreckstoragecab,abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0"/>
     <Price sold="false" />
     <Throwable>
       <!-- inherited -->
diff --git a/Content/Items/Weapons/flakcannon.xml b/Content/Items/Weapons/flakcannon.xml
index 782d93de..7a449997 100644
--- a/Content/Items/Weapons/flakcannon.xml
+++ b/Content/Items/Weapons/flakcannon.xml
@@ -28,7 +28,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0,0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashflakcannon" particleamount="1" velocitymin="50" velocitymax="100" distance="-20" />
@@ -73,7 +73,7 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="75,-258" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="60" slotsperrow="6" itempos="75,-258" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.79">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="flakcannonammo" />
       <StatusEffect type="OnUse" target="Contained">
@@ -84,31 +84,31 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="contained_conditions" displayname="connection.ammunitionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="contained_conditions" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
 
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.74" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>
@@ -176,17 +176,17 @@
   </Item>
   
   <Item name="" identifier="flakcannonammobox" scale="0.5" tags="flakcannonequipment,flakcannonammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="flakcannonammoloader" amount="1" mincondition="1"/>
+    <PreferredContainer primary="flakcannonammoloader" amount="2" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckflakcannonloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.1"/>
+    <PreferredContainer secondary="wreckflakcannonloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.2"/>
     <Price baseprice="160" displaynonempty="true" minleveldifficulty="15">
-      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="6" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" minleveldifficulty="10"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="3" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantoutpost" multiplier="1.3" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="18" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="9" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="45" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="9" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="45" minleveldifficulty="10"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -288,15 +288,15 @@
   <Item name="" identifier="flakcannondirectionalammobox" scale="0.5" tags="flakcannonequipment,flakcannonammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
-    <PreferredContainer secondary="wreckflakcannonloader" amount="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.05"/>
+    <PreferredContainer secondary="wreckflakcannonloader" amount="2" />
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.1"/>
     <Price baseprice="250" displaynonempty="true" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="24" minleveldifficulty="10"/>
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="8" minleveldifficulty="10"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="24" minleveldifficulty="10"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium"/>
@@ -400,7 +400,7 @@
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <PreferredContainer secondary="wreckflakcannonloader" mincondition="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.02"/>
     <Price baseprice="395" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2"/>
@@ -527,14 +527,14 @@
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <PreferredContainer secondary="wreckflakcannonloader" />
-    <PreferredContainer secondary="wreckammoboxcontainer" amount="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" amount="2" spawnprobability="0.02"/>
     <Price baseprice="450" displaynonempty="true" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false"/>
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.3" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="8" minleveldifficulty="15"/>
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="24" minleveldifficulty="15"/>
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="8" minleveldifficulty="15"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="24" minleveldifficulty="15"/>
     </Price>
     <Deconstruct time="10">
       <Item identifier="c4block" mincondition="0.95" />
@@ -653,7 +653,7 @@
     <PreferredContainer primary="flakcannonammoloader" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
     <PreferredContainer secondary="wreckflakcannonloader" mincondition="1" />
-    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.01"/>
+    <PreferredContainer secondary="wreckammoboxcontainer" mincondition="1" spawnprobability="0.02"/>
     <Price baseprice="600" sold="false" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2"/>
diff --git a/Content/Items/Weapons/pulselaser.xml b/Content/Items/Weapons/pulselaser.xml
index 06a80af0..e2174fe9 100644
--- a/Content/Items/Weapons/pulselaser.xml
+++ b/Content/Items/Weapons/pulselaser.xml
@@ -29,7 +29,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <!--<ParticleEmitter particle="FlareBubbles" scalemin="0.5" scalemax="0.5" particleamount="20" distancemin="0" distancemax="500" velocitymin="0" velocitymax="5"/>-->
@@ -64,7 +64,7 @@
     <BrokenSprite texture="Content/Items/Weapons/Loaders.png"  sourcerect="163,563,153,351" origin="0.5,0.5" offset="5,6" depth="0.77" fadein="true" maxcondition="99"/>
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="208,968,32,46" origin="0.5,0.5" />
     <DecorativeSprite name="Pulse Laser Loader Frame Back" texture="Content/Items/Weapons/Loaders.png" depth="0.8" sourcerect="31,569,117,200" origin="0.5,0.5" offset="0,-68" />
-    <LightComponent range="150.0" lightcolor="255,100,100,255" pulsefrequency="12" pulseamount="0.8" powerconsumption="0" IsOn="false" castshadows="true" allowingameediting="false" characterusable="false">
+    <LightComponent range="600" lightcolor="255,100,100,255" pulsefrequency="12" pulseamount="0.8" powerconsumption="0" IsOn="false" castshadows="true" allowingameediting="false" characterusable="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="0,791,165,358" depth="0.1" origin="0.5,0.5" alpha="1.0" />
       <StatusEffect type="OnActive" target="This" stackable="false" delay="0.25" IsOn="false"/>
     </LightComponent>
@@ -82,7 +82,7 @@
         <Affliction identifier="stun" strength="4" />
       </StatusEffect>
     </Repairable>
-    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="1" slotsperrow="6" itempos="83,-260" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.75">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="1" maxstacksize="60" slotsperrow="6" itempos="83,-260" iteminterval="0,0" itemrotation="0" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepth="0.75">
       <GuiFrame relativesize="0.18,0.23" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="pulselaserammo" />
       <!-- when the laser is fired, it triggers this statuseffect, causing contained ammunition boxes to spawn new ammo -->
@@ -98,30 +98,30 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="contained_conditions" displayname="connection.ammunitionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="contained_conditions" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 0"/>
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 20"/>
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 40"/>
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 60"/>
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gt 80"/>
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.88" alpha="1.0" />
       <IsActiveConditional targetcontaineditem="true" conditionpercentage="gte 100"/>
     </LightComponent>    
@@ -189,9 +189,9 @@
   </Item>
 
   <Item name="" identifier="pulselaserammobox" scale="0.5" tags="pulselaserequipment,pulselaserammo,ammobox" category="Weapon" linkable="true" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="pulselaserammosource" amount="1" mincondition="1"/>
+    <PreferredContainer primary="pulselaserammosource" amount="2" mincondition="1"/>
     <PreferredContainer primary="ammoboxcontainer" mincondition="1"/>
-    <Price baseprice="250" minavailable="1" displaynonempty="true" >
+    <Price baseprice="250" minavailable="3" displaynonempty="true" >
       <Price storeidentifier="merchantoutpost" multiplier="1.6" />
       <Price storeidentifier="merchantcity" multiplier="1.4" sold="false"/>
       <Price storeidentifier="merchantresearch" multiplier="1.3" />
@@ -237,7 +237,7 @@
     <Price baseprice="435" sold="false" displaynonempty="true"  minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" multiplier="1.3" />
       <Price storeidentifier="merchantcity" multiplier="1.2" />
-      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.3" minavailable="1"/>
+      <Price storeidentifier="merchantresearch" sold="true" multiplier="1.3" minavailable="3"/>
       <Price storeidentifier="merchantmilitary" multiplier="0.9" />
       <Price storeidentifier="merchantmine" multiplier="1.2" />
       <Price storeidentifier="merchantarmory" multiplier="0.9" />
diff --git a/Content/Items/Weapons/railgun.xml b/Content/Items/Weapons/railgun.xml
index 18be173b..03e71b31 100644
--- a/Content/Items/Weapons/railgun.xml
+++ b/Content/Items/Weapons/railgun.xml
@@ -26,7 +26,7 @@
       <StartMoveSound file="Content/Items/Weapons/RailgunStart.ogg" />
       <EndMoveSound file="Content/Items/Weapons/RailgunStop.ogg" />
       <RequiredSkill identifier="weapons" level="50" />
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2048" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="8192" directional="true" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="1.0,1.0" />
       </LightComponent>
       <ParticleEmitter particle="muzzleflashrailgun" particleamount="1" velocitymin="50" velocitymax="100" />
@@ -59,8 +59,8 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim" />
-      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" />
+      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim" maxwires=10 />
+      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" maxwires=10 />
     </ConnectionPanel>
     <!-- Controller output was made editable in v1.1.4.0, disallow it on periscopes -->
     <Upgrade gameversion="1.1.4.0" allowingameediting="false" />
@@ -71,7 +71,7 @@
     <BrokenSprite texture="Content/Items/Weapons/Loaders.png" sourcerect="163,563,153,351" origin="0.5,0.5" offset="35,4" depth="0.77" fadein="true" maxcondition="99" />
     <UpgradePreviewSprite texture="Content/UI/WeaponUI.png" sourcerect="208,968,32,46" origin="0.5,0.5" />
     <DecorativeSprite name="Railgun Loader Frame Front" texture="Loaders.png" depth="0.8" sourcerect="31,569,117,200" origin="0.5,0.5" offset="0,-30" />
-    <ItemContainer hideitems="false" drawinventory="true" capacity="6" slotsperrow="6" itempos="58,-200" iteminterval="20,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepths="0.79,0.791,0.792,0.793,0.794,0.795">
+    <ItemContainer hideitems="false" drawinventory="true" capacity="18" slotsperrow="5" itempos="58,-200" iteminterval="20,0" itemrotation="90" canbeselected="true" msg="ItemMsgInteractSelect" containedspritedepths="0.79,0.791,0.792,0.793,0.794,0.795">
       <GuiFrame relativesize="0.25,0.2" anchor="Center" style="ItemUI" />
       <Containable items="railgunammo" />
     </ItemContainer>
@@ -92,47 +92,47 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="contained_items" displayname="connection.ammunitionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="contained_items" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
-    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="219,0,36,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.685,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 0" />
     </LightComponent>
-    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="255,170,1,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="1.135,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 1" />
     </LightComponent>
-    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="246,210,2,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.585,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 2" />
     </LightComponent>
-    <LightComponent lightcolor="252,230,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="252,230,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="0.035,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 3" />
     </LightComponent>
-    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="185,214,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-0.515,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 4" />
     </LightComponent>
-    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0.0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
+    <LightComponent lightcolor="79,184,0,150" castshadows="false" range="0" IsOn="true" powerconsumption="0" alphablend="true" allowingameediting="false">
       <sprite texture="Content/Items/Weapons/Loaders.png" sourcerect="348,921,25,27" origin="-1.065,-4.83" alpha="1.0" />
       <IsActiveConditional targetitemcomponent="ItemContainer" ContainedNonBrokenItemCount="gt 5" />
     </LightComponent>
   </Item>
   <Item name="" identifier="railgunshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
-    <PreferredContainer primary="railgunammoloader" amount="5" mincondition="1" />
-    <PreferredContainer primary="railgunammocontainer" amount="6" mincondition="1" />
+    <PreferredContainer primary="railgunammoloader" amount="10" mincondition="1" />
+    <PreferredContainer primary="railgunammocontainer" amount="12" mincondition="1" />
     <!--Ensure that Thalamus always has some railgun shells to use-->
-    <PreferredContainer secondary="wreckrailgunloader" minamount="1" maxamount="4" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.5" />
+    <PreferredContainer secondary="wreckrailgunloader" minamount="2" maxamount="8" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="1" />
     <Price baseprice="70">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="3" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="10" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="10" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="9" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="30" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="30" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -185,7 +185,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem,explosive" />
@@ -193,14 +193,14 @@
   </Item>
   <Item name="" identifier="nuclearshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.1" />
     <Price baseprice="470" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.35" />
       <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" minleveldifficulty="35" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="3" minleveldifficulty="35" />
       <Price storeidentifier="merchantmine" multiplier="1.25" sold="false" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="1" minleveldifficulty="35" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="3" minleveldifficulty="35" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -265,7 +265,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem" />
@@ -297,7 +297,7 @@
   </Item>
   <Item name="" identifier="alienshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
@@ -355,7 +355,7 @@
         <Remove />
       </StatusEffect>
     </Projectile>
-    <ItemContainer hideitems="true" capacity="1" maxstacksize="1" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
+    <ItemContainer hideitems="true" capacity="1" maxstacksize="60" canbeselected="false" containedstateindicatorstyle="explosive" containedspritedepth="0.81">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="64,384,64,64" origin="0.5,0.5" />
       <GuiFrame relativesize="0.2,0.25" anchor="Center" minsize="140,170" maxsize="280,280" style="ItemUI" />
       <Containable items="smallitem,explosive" />
@@ -390,14 +390,14 @@
   </Item>
   <Item name="" identifier="railguncanistershell" tags="railgunequipment,railgunammo,containershell" category="Weapon" linkable="true" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" minamount="1" maxamount="2" spawnprobability="0.2" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" minamount="2" maxamount="4" spawnprobability="0.4" />
     <Price baseprice="95">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="5" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="5" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -429,7 +429,7 @@
         <Conditional InWater="false" />
       </StatusEffect>
     </Holdable>
-    <ItemContainer hideitems="true" capacity="11" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet"
+    <ItemContainer hideitems="true" capacity="33" drawinventory="false" canbeselected="false" canbecombined="true" ShowConditionInContainedStateIndicator="true" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet"
                    spawnwithid="railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet,railguncanistershellpellet">
       <StatusEffect type="OnUse" target="This" condition="-100" disabledeltatime="true">
         <RequiredItem items="railguncanistershellpellet" type="Contained" />
@@ -439,7 +439,7 @@
   </Item>
   <Item name="" identifier="gravityshell" tags="railgunequipment,railgunammo" showcontentsintooltip="true" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy" cargocontaineridentifier="">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.2" />
     <Price baseprice="300" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" sold="false" />
       <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" />
@@ -534,13 +534,13 @@
 
   <Item name="" identifier="railgunharpoon" tags="railgunequipment,railgunammo" health="20" category="Weapon" sonarsize="5" scale="0.5" impactsoundtag="impact_metal_heavy">
     <PreferredContainer primary="railgunammoloader,railgunammocontainer" mincondition="1" />
-    <PreferredContainer secondary="wreckrailgunammocontainer" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckrailgunammocontainer" amount="2" spawnprobability="0.1" />
     <Price baseprice="175">
-      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="1" sold="false"/>
-      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="4"/>
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6"/>
-      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="4"/>
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6"/>
+      <Price storeidentifier="merchantcity" multiplier="1.2" minavailable="3" sold="false"/>
+      <Price storeidentifier="merchantresearch" multiplier="1.3" minavailable="12"/>
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="18"/>
+      <Price storeidentifier="merchantmine" multiplier="1.2" minavailable="12"/>
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="18"/>
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20">
       <RequiredSkill identifier="weapons" level="25" />
diff --git a/Content/Items/Weapons/turrethardpoint.xml b/Content/Items/Weapons/turrethardpoint.xml
index 785cfcc9..7f6a2b6d 100644
--- a/Content/Items/Weapons/turrethardpoint.xml
+++ b/Content/Items/Weapons/turrethardpoint.xml
@@ -12,7 +12,7 @@
     </SwappableItem>
     <StaticBody width="80" radius="80" />
     <Turret rotationlimits="180,360" projectilecount="0" canbeselected="false" characterusable="false" linkable="true" barrelpos="128,-50">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
@@ -41,7 +41,7 @@
     </SwappableItem>
     <StaticBody width="80" radius="80" />
     <Turret rotationlimits="180,360" projectilecount="0" canbeselected="false" characterusable="false" linkable="true" barrelpos="220,-128">
-      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="2500" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
+      <LightComponent LightColor="1.0,0.8,0.8,1.0" Flicker="0.0" range="10000" IsOn="true" drawbehindsubs="true" ignorecontinuoustoggle="true" InheritParentIsActive="false">
         <LightTexture texture="Content/Lights/alphaOne.png" />
       </LightComponent>
     </Turret>
@@ -64,8 +64,8 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim" />
-      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" />
+      <output name="position_out" displayname="connection.turretaimingout" fallbackdisplayname="inputtype.aim" maxwires=10 />
+      <output name="trigger_out" displayname="connection.turrettriggerout" fallbackdisplayname="inputtype.shoot" maxwires=10 />
     </ConnectionPanel>
   </Item>
   
@@ -76,8 +76,8 @@
     <ConnectionPanel selectkey="Action" canbeselected="true" msg="ItemMsgRewireScrewdriver" hudpriority="10">
       <GuiFrame relativesize="0.2,0.32" minsize="400,350" maxsize="480,420" anchor="Center" style="ConnectionPanel" />
       <RequiredItem items="screwdriver" type="Equipped" />
-      <output name="condition_out" displayname="connection.conditionout" />
-      <output name="contained_items" displayname="connection.ammunitionout" />
+      <output name="condition_out" displayname="connection.conditionout" maxwires=10 />
+      <output name="contained_items" displayname="connection.ammunitionout" maxwires=10 />
     </ConnectionPanel>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Content/Items/Weapons/weapons.xml b/Content/Items/Weapons/weapons.xml
index ae63a61b..b17f340b 100644
--- a/Content/Items/Weapons/weapons.xml
+++ b/Content/Items/Weapons/weapons.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Items>
-  <Item name="" identifier="spear" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="harpoongun" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="3" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="spear" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="harpoongun" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="7">
       <Price storeidentifier="merchantoutpost" minavailable="12" multiplier="1.5" />
       <Price storeidentifier="merchantcity" minavailable="12" multiplier="1.25" />
@@ -46,11 +46,11 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="alienspear" category="Weapon,Alien" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="alienspear" category="Weapon,Alien" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="harpoongun" />
-    <PreferredContainer secondary="ruinstoragesmall,ruinstorage" minamount="1" maxamount="3" spawnprobability="0.1" />
-    <PreferredContainer secondary="ruinstoragelarge" amount="6" spawnprobability="0.2" />
-    <PreferredContainer primary="ruintreasure" amount="6" spawnprobability="0.25" />
+    <PreferredContainer secondary="ruinstoragesmall,ruinstorage" minamount="2" maxamount="6" spawnprobability="0.2" />
+    <PreferredContainer secondary="ruinstoragelarge" amount="12" spawnprobability="0.4" />
+    <PreferredContainer primary="ruintreasure" amount="12" spawnprobability="0.5" />
     <PreferredContainer primary="secarmcab,armcab" />
     <Price baseprice="50" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
@@ -91,18 +91,18 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="explosivespear" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo,demolitionsexpert" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="explosivespear" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,harpoonammo,handheldammo,demolitionsexpert" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="harpoongun" />
-    <PreferredContainer primary="armcab" amount="6" spawnprobability="0.1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="6" spawnprobability="0.1" />
+    <PreferredContainer primary="armcab" amount="12" spawnprobability="0.2" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="12" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" />
     <Price baseprice="80">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.4" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="18" />
     </Price>
     <Deconstruct time="5"></Deconstruct>
     <Fabricate suitablefabricators="fabricator" requiredtime="10" amount="2">
@@ -132,17 +132,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="harpoongun" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.05" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="2" spawnprobability="1" notcampaign="true"/>
-    <Price baseprice="170" minavailable="1">
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="4" spawnprobability="1" notcampaign="true"/>
+    <Price baseprice="170" minavailable="3">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -170,35 +170,35 @@
       <RequiredItems items="harpoonammo" type="Contained" msg="ItemMsgSpearRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false" capacity="1" maxstacksize="6" containedstateindicatorslot="0" containedstateindicatorstyle="spear" containedspritedepths="0.551,0.552,0.553,0.554,0.555,0.556">
+    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false" capacity="1" maxstacksize="60" containedstateindicatorslot="0" containedstateindicatorstyle="spear" containedspritedepths="0.551,0.552,0.553,0.554,0.555,0.556">
       <Containable items="harpoonammo" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="0,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />   
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="18,12" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="0" soundrange="500" fadeouttime="2" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="30" />
   </Item>
-  <Item name="" identifier="revolverround" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,revolverammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="revolver" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" amount="6" spawnprobability="1" notpvp="true" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="6" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.25" />
+  <Item name="" identifier="revolverround" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" Scale="0.5" tags="smallitem,revolverammo,handheldammo,pistolammoitem" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="revolver" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" amount="12" spawnprobability="1" notpvp="true" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="12" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.5" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="12">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="12" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="60" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="12" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="60" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="36" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="36" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="36" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="180" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="36" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="180" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="12">
       <RequiredSkill identifier="weapons" level="30" />
@@ -232,7 +232,7 @@
     <!--
       An example on using the PreferredContainer:
       
-      <PreferredContainer primary="somespecialcontainer" secondary="locker" minamount="1" maxamount="1" spawnprobability="1"/>
+      <PreferredContainer primary="somespecialcontainer" secondary="locker" minamount="2" maxamount="2" spawnprobability="1"/>
       
           PreferredContainers are used for automatic item placement and to tell the bots where items belong to.
           
@@ -250,14 +250,14 @@
           The evaluation is weight based: it's possible that the bots use a container marked as "secondary" or even a container that is not defined here, if it's close enough.
           If you want to tell the bots that "only put certain items in this container", use the "Containable Restrictions" that can be defined in the sub editor.
     -->
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.25" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.5" />
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
     <!--
       An example on using the Price elements:
       
-      <Price baseprice="0" sold="true" soldelsewhere="false" buyingpricemultiplier="1.0" minamount="0" maxamount="0" canbespecial="true" minleveldifficulty="0" displaynonempty="false">
-        <Price storeidentifier="" multiplier="1.0" />
+      <Price baseprice="0" sold="true" soldelsewhere="false" buyingpricemultiplier="1" minamount="0" maxamount="0" canbespecial="true" minleveldifficulty="0" displaynonempty="false">
+        <Price storeidentifier="" multiplier="1" />
       </Price>
       
           The above example includes all the attributes that can be used in the price definitions. The listed attribute values are the values the attributes will default to if they are
@@ -282,11 +282,11 @@
     -->
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" minavailable="1" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" sold="false" minavailable="3" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -315,13 +315,13 @@
       <RequiredItems items="revolverammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="40" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" hideitems="true" containedstateindicatorstyle="bullet">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="bullet">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <Containable items="revolverammo" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="40" />
@@ -353,20 +353,20 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="smgmagazine" maxstacksize="8" maxstacksizecharacterinventory="2" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,smgammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="smg,smgunique,machinepistol" amount="1" spawnprobability="1" />
-    <PreferredContainer primary="armcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="2" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="smgmagazine" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,smgammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="smg,smgunique,machinepistol" amount="2" spawnprobability="1" />
+    <PreferredContainer primary="armcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="4" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="8" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="16" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="100" displaynonempty="true" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="25" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="40" />
@@ -400,17 +400,17 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="smg" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallautoweapon,smallitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.25" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.5" />
     <PreferredContainer secondary="armcab,weaponholder" />
     <Price baseprice="390" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="35" requiresrecipe="true">
       <RequiredSkill identifier="weapons" level="55" />
@@ -446,34 +446,34 @@
       <RequiredItems items="smgammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="smgammo" hide="false" itempos="4,-10" rotation="-30" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="stungrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="3" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="stungrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="6" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="armcab" />
     <Upgrade gameversion="0.9.2.0" scale="0.5" />
     <Price baseprice="125">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -537,21 +537,21 @@
       </StatusEffect>
     </ItemComponent>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.2" />
+      <QualityStat stattype="ExplosionRadius" value="0.6" />
     </Quality>
   </Item>
-  <Item name="" identifier="empgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="empgrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="175">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
-      <Price storeidentifier="merchantengineering" multiplier="1.2" minavailable="2" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantengineering" multiplier="1.2" minavailable="6" />
     </Price>
     <Upgrade gameversion="0.9.3.0" scale="0.5" />
     <Deconstruct time="10">
@@ -611,22 +611,22 @@
       </StatusEffect>
     </ItemComponent>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1" />
-      <QualityStat stattype="ExplosionDamage" value="0.1" />
+      <QualityStat stattype="ExplosionRadius" value="0.3" />
+      <QualityStat stattype="ExplosionDamage" value="0.3" />
     </Quality>
   </Item>
-  <Item name="" identifier="fraggrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="fraggrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer secondary="armcab" />
     <Upgrade gameversion="0.9.3.0" scale="0.5" />
     <Price baseprice="150">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -683,8 +683,8 @@
       </StatusEffect>
     </ItemComponent>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1" />
-      <QualityStat stattype="ExplosionDamage" value="0.1" />
+      <QualityStat stattype="ExplosionRadius" value="0.3" />
+      <QualityStat stattype="ExplosionDamage" value="0.3" />
     </Quality>
   </Item>
   <!-- Emitters shoot themselves into the air and then land, creating an effect of "spreading" incendiary compound, covering given surfaces -->
@@ -694,7 +694,7 @@
     <!-- Sticks to characters for additional damage over time.-->
     <Projectile characterusable="false" launchimpulse="5" sticktocharacters="true" sticktostructures="false" sticktoitems="true" sticktodeflective="true">
       <StatusEffect type="OnImpact" target="This" delay="0.1" IsOn="true"/>
-      <LightComponent LightColor="220,100,45,150" Flicker="0.8" range="110" IsOn="false">
+      <LightComponent LightColor="220,100,45,150" Flicker="0.8" range="440" IsOn="false">
         <!-- Drain oxygen -->
         <StatusEffect type="OnActive" target="Hull" oxygen="-400.0"/>
         <StatusEffect type="OnActive" targettype="This" Condition="-16.5">
@@ -718,18 +718,18 @@
       </StatusEffect>
     </Projectile>
   </Item>
-  <Item name="" identifier="incendiumgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="3" spawnprobability="0.75" notcampaign="true" notpvp="true" />
-    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.05" />
+  <Item name="" identifier="incendiumgrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" cargocontaineridentifier="explosivecrate" tags="smallitem,weapon,explosive,demolitionsexpert,handgrenade" Scale="0.5" impactsoundtag="impact_metal_heavy">
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="6" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer primary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.1" />
     <PreferredContainer secondary="armcab" />
     <Upgrade gameversion="0.9.3.0" scale="0.5" />
     <Price baseprice="175" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="2">
@@ -782,22 +782,22 @@
       </StatusEffect>
     </ItemComponent>
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.15" />
-      <QualityStat stattype="ExplosionDamage" value="0.15" />
+      <QualityStat stattype="ExplosionRadius" value="0.45" />
+      <QualityStat stattype="ExplosionDamage" value="0.45" />
     </Quality>
   </Item>
   <Item name="" identifier="stunbaton" category="Weapon" Tags="smallitem,weapon,stunner,gunsmith,mountableweapon" Scale="0.5" cargocontaineridentifier="metalcrate" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Upgrade gameversion="0.9.2.0" scale="0.5" />
     <Price baseprice="200">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="18" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -855,27 +855,27 @@
         <Conditional entitytype="eq Character" />
       </StatusEffect>
     </MeleeWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="true" containedstateindicatorstyle="battery">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="true" containedstateindicatorstyle="battery">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <Containable items="mobilebattery" />
     </ItemContainer>
     <aitarget sightrange="500" soundrange="500" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="StrikingPowerMultiplier" value="0.25" />
+      <QualityStat stattype="StrikingPowerMultiplier" value="0.75" />
     </Quality>
   </Item>
   <Item name="" identifier="divingknife" category="Weapon" Tags="smallitem,weapon,gunsmith,mountableweapon,sharptool" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" RequireAimToUse="True">
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.25" />
-    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" amount="1" spawnprobability="0.05" />
-    <PreferredContainer secondary="beaconsupplycab" amount="1" spawnprobability="0.05" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.5" />
+    <PreferredContainer secondary="abandonedstoragecab,piratestoragecab" amount="2" spawnprobability="0.1" />
+    <PreferredContainer secondary="beaconsupplycab" amount="2" spawnprobability="0.1" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Price baseprice="29">
-      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="6" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="8" />
-      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="15" />
-      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="2" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="15" />
+      <Price storeidentifier="merchantoutpost" multiplier="1.5" minavailable="18" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="24" />
+      <Price storeidentifier="merchantresearch" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="45" />
+      <Price storeidentifier="merchantmine" multiplier="1.25" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="45" />
       <Price storeidentifier="merchanthusk" minavailable="0" maxavailable="2"/>
     </Price>
     <Deconstruct time="10">
@@ -906,21 +906,21 @@
     </MeleeWeapon>
     <aitarget sightrange="500" soundrange="250" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="StrikingPowerMultiplier" value="0.1" />
+      <QualityStat stattype="StrikingPowerMultiplier" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="grenadelauncher" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="0.2" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="0.4" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.2" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="1000" sold="false" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="3" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="1" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="3" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -948,7 +948,7 @@
       <RequiredSkill identifier="weapons" level="60" />
     </RangedWeapon>
     <!--Holds six grenades at a time-->
-    <ItemContainer capacity="6" maxstacksize="1" hideitems="false" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="18" maxstacksize="60" hideitems="false" ShowTotalStackCapacityInContainedStateIndicator="true" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="grenade" hide="true" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
@@ -957,29 +957,29 @@
       <SlotIcon slotindex="4" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="5" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="6" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="500" soundrange="500" fadeouttime="3" />
     <Quality>
-      <QualityStat stattype="ExplosionRadius" value="0.1" />
-      <QualityStat stattype="ExplosionDamage" value="0.1" />
+      <QualityStat stattype="ExplosionRadius" value="0.3" />
+      <QualityStat stattype="ExplosionDamage" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="60" />
   </Item>
-  <Item name="" identifier="40mmgrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="grenadelauncher" amount="6" spawnprobability="1" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="2" spawnprobability="0.2" />
+  <Item name="" identifier="40mmgrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="grenadelauncher" amount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="4" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Price baseprice="100" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="12" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -1013,16 +1013,16 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="40mmstungrenade" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="40mmstungrenade" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,grenade" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer primary="secarmcab" secondary="armcab" />
     <Price baseprice="120" sold="false">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
       <Price storeidentifier="merchantcity" multiplier="1.25" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" sold="true" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" sold="true" multiplier="0.9" minavailable="12" />
     </Price>
     <Deconstruct time="5">
       <Item identifier="iron" />
@@ -1056,18 +1056,18 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="shotgun" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckweaponholder" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckweaponholder" amount="2" spawnprobability="0.06" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="500" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1105,37 +1105,37 @@
       <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="shotgunammo" hide="true" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="26,-3" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="shotgunshell" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="shotgun" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="autoshotgun" amount="8" spawnprobability="1" />
-    <PreferredContainer primary="shotgununique" amount="2" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="shotgunshell" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="shotgun" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="autoshotgun" amount="16" spawnprobability="1" />
+    <PreferredContainer primary="shotgununique" amount="4" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
-    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="32" spawnprobability="1" notcampaign="true"/>
+    <PreferredContainer secondary="respawncontainer_kingofthehull" amount="64" spawnprobability="1" notcampaign="true"/>
     <Price baseprice="30" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" sold="true" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="36" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="30" />
@@ -1167,19 +1167,19 @@
     </Projectile>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
-  <Item name="" identifier="shotgunshellblunt" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+  <Item name="" identifier="shotgunshellblunt" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,shotgunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
     <PreferredContainer primary="shotgun,autoshotgun,shotgununique" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="15" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" sold="true" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="36" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="12">
       <RequiredSkill identifier="weapons" level="30" />
@@ -1204,16 +1204,16 @@
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="stungun" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallitem,weapon,gun,stunner,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" minamount="1" maxamount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.1" />
+    <PreferredContainer primary="secarmcab" minamount="2" maxamount="4" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.2" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="180">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.35" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="4" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1239,29 +1239,29 @@
       <RequiredItems items="stungunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="20" />
     </RangedWeapon>
-    <ItemContainer capacity="1" hideitems="true" maxstacksize="1" containedstateindicatorstyle="bullet">
+    <ItemContainer capacity="1" hideitems="true" maxstacksize="60" containedstateindicatorstyle="bullet">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <Containable items="stungunammo" />
     </ItemContainer>
     <aitarget sightrange="0" soundrange="0" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.2" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.6" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
     <SkillRequirementHint identifier="weapons" level="20" />
   </Item>
-  <Item name="" identifier="stungundart" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="8" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="armcab" minamount="1" maxamount="10" spawnprobability="0.25" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
-    <PreferredContainer primary="stungun" amount="2" spawnprobability="1" />
+  <Item name="" identifier="stungundart" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,stungunammo,handheldammo" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="armcab" minamount="2" maxamount="20" spawnprobability="0.5" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
+    <PreferredContainer primary="stungun" amount="4" spawnprobability="1" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="30">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="9" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="18" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="18" />
     </Price>
     <Deconstruct time="5" />
     <Fabricate suitablefabricators="fabricator" requiredtime="20" amount="2">
@@ -1354,7 +1354,7 @@
   
   <Item name="" identifier="shotgununique" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
     <Price baseprice="931" sold="false" canbespecial="false" />
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1390,23 +1390,23 @@
       <RequiredItems items="shotgunammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="2" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="shotgunammo" hide="true" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="22,-1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
-  <Item name="" identifier="spearunique" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="6" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,handheldammo,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
+  <Item name="" identifier="spearunique" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="mediumitem,handheldammo,harpoonammo" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="harpoongun,armcab" secondary="secarmcab" />
-    <PreferredContainer secondary="wrecksecarmcab,wreckarmcab,abandonedsecarmcab,piratesecarmcab,abandonedarmcab,piratearmcab" amount="6" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,wreckarmcab,abandonedsecarmcab,piratesecarmcab,abandonedarmcab,piratearmcab" amount="12" spawnprobability="0.1" />
     <Price baseprice="550" sold="false" canbespecial="false" />
     <Deconstruct time="5">
       <Item identifier="steel" />
@@ -1440,7 +1440,7 @@
   </Item>
   <Item name="" identifier="divingknifeunique" category="Weapon" Tags="smallitem,weapon,mountableweapon,sharptool" cargocontaineridentifier="metalcrate" scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true" RequireAimToUse="True">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
     <Price baseprice="770" sold="false" canbespecial="false" />
     <Deconstruct time="10">
       <Item identifier="iron" />
@@ -1468,13 +1468,13 @@
     </MeleeWeapon>
     <aitarget sightrange="500" soundrange="250" fadeouttime="1" />
     <Quality>
-      <QualityStat stattype="StrikingPowerMultiplier" value="0.1" />
+      <QualityStat stattype="StrikingPowerMultiplier" value="0.3" />
     </Quality>
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>
   <Item name="" identifier="smgunique" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallautoweapon,smallitem,weapon,gun,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light" hideinmenus="true" allowasextracargo="true">
     <PreferredContainer primary="secarmcab" secondary="armcab" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.05" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" spawnprobability="0.1" />
     <Price baseprice="1064" sold="false" canbespecial="false" />
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1507,33 +1507,33 @@
       <StatusEffect type="OnUse" target="This" reload="0.1" setvalue="true" delay="0.7" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="smgammo" hide="false" itempos="4,-5" rotation="-25" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="17,5" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
   <Item name="" identifier="rifle" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.2" />
-    <PreferredContainer secondary="wreckweaponholder" amount="1" spawnprobability="0.03" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.4" />
+    <PreferredContainer secondary="wreckweaponholder" amount="2" spawnprobability="0.06" />
     <PreferredContainer secondary="armcab" />
     <Price baseprice="500" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1592,37 +1592,37 @@
       <RequiredItems items="rifleammo,grenade" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="60" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="1" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorstyle="bullet" containedstateindicatorslot="1" containedspritedepth="0.56">
       <Containable items="grenade" hide="false" itempos="50,0" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="448,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="6">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="rifleammo" hide="true" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="30,-3" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="3000" soundrange="5000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="60" />
   </Item>
-  <Item name="" identifier="riflebullet" category="Weapon" maxstacksize="32" maxstacksizecharacterinventory="12" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,rifleammo,handheldammo,riflemanbonus" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="rifle" amount="6" spawnprobability="1" />
-    <PreferredContainer primary="armcab" minamount="6" maxamount="12" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" minamount="1" maxamount="6" spawnprobability="0.5" />
-    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="1" maxamount="3" spawnprobability="0.2" />
+  <Item name="" identifier="riflebullet" category="Weapon" maxstacksize="60" maxstacksizecharacterinventory="60" interactthroughwalls="true" cargocontaineridentifier="metalcrate" tags="smallitem,rifleammo,handheldammo,riflemanbonus" Scale="0.5" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="rifle" amount="12" spawnprobability="1" />
+    <PreferredContainer primary="armcab" minamount="122" maxamount="24" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" minamount="2" maxamount="12" spawnprobability="1" />
+    <PreferredContainer secondary="wreckarmcab,wrecksecarmcab,abandonedarmcab,piratearmcab,abandonedsecarmcab,piratesecarmcab" minamount="2" maxamount="6" spawnprobability="0.4" />
     <PreferredContainer secondary="secarmcab" />
     <Price baseprice="30" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="4" sold="true" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="12" sold="true" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="36" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="12" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="36" />
     </Price>
     <Fabricate suitablefabricators="fabricator" requiredtime="20" requiresrecipe="true" amount="6">
       <RequiredSkill identifier="weapons" level="30" />
@@ -1724,25 +1724,25 @@
       <RequiredItems items="hmgammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="90" />
     </RangedWeapon>
-    <Propulsion force="-30" usablein="both" ApplyToHands="false">
+    <Propulsion force="-90" usablein="both" ApplyToHands="false">
       <RequiredItems items="hmgammo" type="Contained" />
     </Propulsion>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <Containable items="hmgammo" hide="false" itempos="0,-10" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="30,1" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="90" />
   </Item>
-  <Item name="" identifier="hmgmagazine" maxstacksize="4" maxstacksizecharacterinventory="1" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,hmgammo,handheldammo" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="hmg" minamount="1" maxamount="1" spawnprobability="1" />
+  <Item name="" identifier="hmgmagazine" maxstacksize="60" maxstacksizecharacterinventory="60" scale="0.5" category="Weapon" cargocontaineridentifier="metalcrate" linkable="true" tags="smallitem,hmgammo,handheldammo" impactsoundtag="impact_metal_light">
+    <PreferredContainer primary="hmg" minamount="2" maxamount="2" spawnprobability="1" />
     <PreferredContainer primary="armcab" secondary="secarmcab" />
     <Price baseprice="330" sold="true" minleveldifficulty="65" displaynonempty="true">
       <Price storeidentifier="merchantoutpost" multiplier="1.4" />
@@ -1809,16 +1809,16 @@
     </Projectile>
   </Item>
   <Item name="" identifier="harpooncoilrifle" category="Weapon" cargocontaineridentifier="metalcrate" tags="mediumitem,weapon,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.005" />
-    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="1" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckweaponholder" spawnprobability="0.01" />
+    <PreferredContainer secondary="wreckarmcab,abandonedarmcab,piratearmcab" amount="2" spawnprobability="0.02" />
     <PreferredContainer primary="secarmcab" secondary="armcab,weaponholder" />
     <Price baseprice="270" minleveldifficulty="30">
       <Price storeidentifier="merchantoutpost" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="2" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="6" sold="false" />
       <Price storeidentifier="merchantresearch" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="9" />
       <Price storeidentifier="merchantmine" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="3" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="9" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="aluminium" />
@@ -1852,36 +1852,36 @@
       <RequiredItems items="harpoonammo" type="Contained" msg="ItemMsgSpearRequired" />
       <RequiredSkill identifier="weapons" level="30" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="6" slotsperrow="2" hideitems="false" iteminterval="0,-4" itempos="27,10" containedstateindicatorstyle="spear" containedstateindicatorslot="0" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" slotsperrow="2" hideitems="false" iteminterval="0,-4" itempos="27,10" containedstateindicatorstyle="spear" containedstateindicatorslot="0" containedspritedepth="0.56">
       <Containable items="harpoonammo" hide="false" />
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="0,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="1" texture="Content/UI/StatusMonitorUI.png" sourcerect="128,448,64,64" origin="0.5,0.5" />
       <SlotIcon slotindex="2" texture="Content/UI/StatusMonitorUI.png" sourcerect="320,448,64,64" origin="0.5,0.5" />
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="mobilebattery" hide="true" />
       </SubContainer>
-      <SubContainer capacity="1" maxstacksize="1">
+      <SubContainer capacity="1" maxstacksize="60">
         <Containable items="flashlight" hide="false" itempos="18,13" setactive="true" />
       </SubContainer>
     </ItemContainer>
     <aitarget sightrange="0" soundrange="500" fadeouttime="2" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="30" />
   </Item>
   <Item name="" identifier="machinepistol" category="Weapon" cargocontaineridentifier="metalcrate" tags="smallautoweapon,smallitem,weapon,gun,gunsmith,provocativetohumanai,mountableweapon" Scale="0.5" impactsoundtag="impact_metal_light">
-    <PreferredContainer primary="secarmcab" amount="1" spawnprobability="1" notcampaign="true" notpvp="true" />
-    <PreferredContainer secondary="outpostsecarmcab" amount="1" spawnprobability="0.5" />
-    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="1" spawnprobability="0.25" />
+    <PreferredContainer primary="secarmcab" amount="2" spawnprobability="1" notcampaign="true" notpvp="true" />
+    <PreferredContainer secondary="outpostsecarmcab" amount="2" spawnprobability="1" />
+    <PreferredContainer secondary="wrecksecarmcab,abandonedsecarmcab,piratesecarmcab" amount="2" spawnprobability="0.5" />
     <PreferredContainer secondary="armcab,weaponholder" />
     <Price baseprice="200" minleveldifficulty="15">
       <Price storeidentifier="merchantoutpost" sold="false" multiplier="1.5" />
-      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="1" sold="false" />
+      <Price storeidentifier="merchantcity" multiplier="1.25" minavailable="3" sold="false" />
       <Price storeidentifier="merchantresearch" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantmilitary" multiplier="0.9" minavailable="6" />
       <Price storeidentifier="merchantmine" sold="false" multiplier="1.25" />
-      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="2" />
+      <Price storeidentifier="merchantarmory" multiplier="0.9" minavailable="6" />
     </Price>
     <Deconstruct time="10">
       <Item identifier="steel" />
@@ -1911,13 +1911,13 @@
       <RequiredItems items="smgammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="50" />
     </RangedWeapon>
-    <ItemContainer capacity="1" maxstacksize="1" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
+    <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">
       <SlotIcon slotindex="0" texture="Content/UI/StatusMonitorUI.png" sourcerect="256,448,64,64" origin="0.5,0.5" />
       <Containable items="smgammo" hide="false" itempos="3,-5" rotation="-5" />
     </ItemContainer>
     <aitarget sightrange="2000" soundrange="4000" fadeouttime="5" />
     <Quality>
-      <QualityStat stattype="FirepowerMultiplier" value="0.1" />
+      <QualityStat stattype="FirepowerMultiplier" value="0.3" />
     </Quality>
     <SkillRequirementHint identifier="weapons" level="50" />
   </Item>
diff --git a/Content/Items/idcard.xml b/Content/Items/idcard.xml
index e4c85c54..173b943c 100644
--- a/Content/Items/idcard.xml
+++ b/Content/Items/idcard.xml
@@ -3,8 +3,8 @@
   <Item name="" identifier="idcard" category="Equipment" Tags="smallitem,identitycard" cargocontaineridentifier="metalcrate">
     <PreferredContainer primary="crewcab"/>
     <Price baseprice="10">
-      <Price storeidentifier="merchantoutpost" minavailable="4" />
-      <Price storeidentifier="merchantcity" minavailable="6" />
+      <Price storeidentifier="merchantoutpost" minavailable="12" />
+      <Price storeidentifier="merchantcity" minavailable="18" />
     </Price>
     <InventoryIcon texture="Content/Items/InventoryIconAtlas.png" sourcerect="192,64,64,64" origin="0.5,0.5" />
     <Sprite texture="idcard.png" depth="0.5" sourcerect="0,0,16,16" />
diff --git a/Content/Missions.xml b/Content/Missions.xml
index 71a6c7b2..923ffc29 100644
--- a/Content/Missions.xml
+++ b/Content/Missions.xml
@@ -7,7 +7,7 @@
     type="SalvageRuin"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="ruin"
@@ -33,7 +33,7 @@
     type="SalvageCave"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="cave"
@@ -58,7 +58,7 @@
     type="SalvageCave"
     difficulty="4"
     commonness="100"
-    reward="6000"
+    reward="24000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="AbyssCave"
@@ -83,7 +83,7 @@
     description=""
     difficulty="3"
     commonness="0"
-    reward="3500"
+    reward="14000"
     achievementidentifier="artifactmission"
     sonaricon="artifact"
     spawntype="ruin"
@@ -120,7 +120,7 @@
     type="SalvageWreck"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     achievementidentifier="salvagewreckmission"
     spawntype="wreck"
     showmessagewhenpickedup="true"
@@ -155,7 +155,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="3000"
+    reward="12000"
     achievementidentifier="salvagewreckmission"
     spawntype="wreck"
     showmessagewhenpickedup="true"
@@ -192,7 +192,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     achievementidentifier="salvagewreckmission"
     spawntype="wreck"
     showmessagewhenpickedup="true"
@@ -233,7 +233,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="2000"
+    reward="8000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"    
@@ -321,7 +321,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="3000"
+    reward="12000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"    
@@ -411,7 +411,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"    
@@ -500,7 +500,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="2000"
+    reward="8000"
     spawntype="wreck"
     ContainerTag="cargocontainer"
     PartiallyRetrievedMessage="missionmessage.lostcargo.partiallyretrieved"
@@ -533,7 +533,7 @@
     type="SalvageWreck"
     difficulty="3"
     commonness="100"
-    reward="3000"
+    reward="12000"
     spawntype="wreck"
     showmessagewhenpickedup="true"
     requirewreck="true">
@@ -564,7 +564,7 @@
       type="EliminateTargets"
       difficulty="4"
       commonness="100"
-      reward="4000"
+      reward="16000"
       sonarlabel="target"
       targetitems="thalamusbrain1"
       targetsub="Wreck"
@@ -586,7 +586,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000">
     <monster character="Hammerhead_m" min="2" max="3"/>
     <Reputation identifier="location" amount="1" />
@@ -601,7 +601,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000"
     monsterfile="Hammerheadgold_m">
     <monster character="Hammerhead_m" min="2" max="3"/>
@@ -617,7 +617,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="1500"
+    reward="6000"
     maxsonarmarkerdistance="10000"
     monsterfile="Crawler_large">
     <monster character="crawler" min="3" max="4"/>
@@ -632,7 +632,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000"
     monsterfile="Moloch_m">
     <Reputation identifier="location" amount="2" />
@@ -647,7 +647,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     maxsonarmarkerdistance="10000"
     monsterfile="Molochblack_m">
     <Reputation identifier="location" amount="2" />
@@ -661,7 +661,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.crawler"
     monsterfile="crawlerbroodmother_m">
@@ -677,7 +677,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="4500"
+    reward="18000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.crawler"
     monsterfile="crawlerbroodmother_m">
@@ -693,7 +693,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     maxsonarmarkerdistance="10000">
     <monster character="hammerheadmatriarch" count="1"/>
     <monster character="hammerhead" min="3" max="5"/>
@@ -709,7 +709,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000">
     <monster character="hammerheadmatriarch" count="1"/>
     <monster character="hammerhead" min="2" max="2"/>
@@ -725,7 +725,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.spineling"
     monsterfile="spineling_giant">
@@ -742,7 +742,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="4500"
+    reward="18000"
     maxsonarmarkerdistance="10000"
     sonarlabel="character.spineling"
     monsterfile="spineling_giant">
@@ -758,7 +758,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     maxsonarmarkerdistance="10000">
     <monster character="tigerthresher" min="8" max="10"/>
     <monster character="bonethresher" min="2" max="3"/>
@@ -774,7 +774,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     maxsonarmarkerdistance="10000">
     <monster character="tigerthresher" min="5" max="6"/>
     <monster character="bonethresher" min="1" max="2"/>
@@ -789,7 +789,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000">
     <monster character="crawler" min="5" max="6"/>
     <Reputation identifier="location" amount="1" />
@@ -806,7 +806,7 @@
     type="Monster"
     difficulty="3"
     commonness="33"
-    reward="3500"
+    reward="14000"
     successmessage="missionsuccess.killcrawlerswarm1"
     maxsonarmarkerdistance="10000">
     <monster character="crawler" min="14" max="15"/>
@@ -824,7 +824,7 @@
     type="Monster"
     difficulty="3"
     commonness="33"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000">
     <monster character="crawler" min="10" max="12"/>
     <monster character="crawlerbroodmother" min="1" max="1"/>
@@ -841,7 +841,7 @@
     type="Monster"
     difficulty="3"
     commonness="33"
-    reward="3500"
+    reward="14000"
     maxsonarmarkerdistance="10000">
     <monster character="crawlerhusk" min="10" max="12"/>
     <Reputation identifier="location" amount="2" />
@@ -858,7 +858,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     maxsonarmarkerdistance="10000">
     <monster character="Spineling" min="5" max="6"/>
     <Reputation identifier="location" amount="1" />
@@ -874,7 +874,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     maxsonarmarkerdistance="10000">
     <monster character="Spineling" min="14" max="15"/>
     <Reputation identifier="location" amount="1" />
@@ -890,7 +890,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5500"
+    reward="22000"
     maxsonarmarkerdistance="10000">
     <monster character="Spineling" min="8" max="10"/>
     <monster character="Spineling_Morbusine" min="4" max="6"/>
@@ -904,7 +904,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2000"
+    reward="8000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="2" max="3"/>
@@ -919,7 +919,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="3500"
+    reward="14000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="2" max="3"/>
@@ -936,7 +936,7 @@
     type="Monster"
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="2" max="3"/>
@@ -954,7 +954,7 @@
     type="Monster"
     difficulty="4"
     commonness="100"
-    reward="5000"
+    reward="20000"
     sonarlabel="character.mudraptor"
     maxsonarmarkerdistance="10000">
     <monster character="mudraptor_unarmored" min="1" max="2"/>
@@ -973,7 +973,7 @@
     sideobjective="true"
     difficulty="4"
     commonness="0"
-    reward="8500"
+    reward="34000"
     sonarlabel="target"
     spawntype="Abyss"
     maxsonarmarkerdistance="20000"
@@ -992,7 +992,7 @@
     sideobjective="true"
     difficulty="4"
     commonness="0"
-    reward="8500"
+    reward="34000"
     sonarlabel="target"
     spawntype="Abyss"
     maxsonarmarkerdistance="20000"
@@ -1011,7 +1011,7 @@
     sideobjective="true"
     difficulty="4"
     commonness="0"
-    reward="8500"
+    reward="34000"
     sonarlabel="target"
     spawntype="Abyss"
     maxsonarmarkerdistance="20000"
@@ -1030,7 +1030,7 @@
     commonness="100"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="explosivecrate" reward="200" maxcount="15">
+      <Item identifier="explosivecrate" reward="800" maxcount="15">
         <Item identifier="compoundn" amount="10"/>
         <Item identifier="detonator" amount="10">
           <Item identifier="compoundn"/>
@@ -1050,7 +1050,7 @@
     commonness="100"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="explosivecrate" reward="400" maxcount="10">
+      <Item identifier="explosivecrate" reward="1600" maxcount="10">
         <Item identifier="volatilecompoundn" amount="10"/>
         <Item identifier="detonator" amount="10">
           <Item identifier="volatilecompoundn"/>
@@ -1070,7 +1070,7 @@
     commonness="100"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="securemetalcrate" reward="600" maxcount="4">
+      <Item identifier="securemetalcrate" reward="2400" maxcount="4">
         <Item identifier="smg" amount="1"/>
         <Item identifier="smgmagazine" amount="9"/>
         <Item identifier="fraggrenade" amount="2"/>
@@ -1087,11 +1087,11 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Items>
-      <Item identifier="chemicalcrate" reward="140" maxcount="20">
+      <Item identifier="chemicalcrate" reward="560" maxcount="20">
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="sulphuricacid" amount="5"/>
         <Item identifier="morbusine" amount="5"/>
@@ -1112,18 +1112,18 @@
     type="Cargo"
     difficulty="2"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Items>
-      <Item identifier="chemicalcratedamaged" reward="160" maxcount="2">
+      <Item identifier="chemicalcratedamaged" reward="640" maxcount="2">
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="potassium" amount="5"/>
         <Item identifier="lithium" amount="5"/>
         <Item identifier="flashpowder" amount="3"/>
         <Item identifier="chloralhydrate" amount="2"/>
       </Item>
-      <Item identifier="chemicalcrate" reward="160" maxcount="18">
+      <Item identifier="chemicalcrate" reward="640" maxcount="18">
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="potassium" amount="5"/>
         <Item identifier="lithium" amount="5"/>
@@ -1142,10 +1142,10 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="chemicalcrate" reward="250" maxcount="12">
+      <Item identifier="chemicalcrate" reward="1000" maxcount="12">
         <Item identifier="huskeggsbasic" amount="10"/>
       </Item>
     </Items>
@@ -1160,10 +1160,10 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="700"
+    reward="2800"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="explosivecrate" reward="350" maxcount="10">
+      <Item identifier="explosivecrate" reward="1400" maxcount="10">
         <Item identifier="nitroglycerin" amount="20"/>
       </Item>
     </Items>
@@ -1178,10 +1178,10 @@
     type="Cargo"
     difficulty="3"
     commonness="100"
-    reward="700"
+    reward="2800"
     achievementidentifier="cargomission">
     <Items>
-      <Item identifier="magneticsuspensioncrate" reward="800" maxcount="4">
+      <Item identifier="magneticsuspensioncrate" reward="3200" maxcount="4">
         <Item identifier="batterycell" amount="1"/>
         <Item identifier="volatilenitroglycerin" amount="10"/>
       </Item>
@@ -1197,11 +1197,11 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Items>
-      <Item identifier="metalcrate" reward="500" maxcount="10">
+      <Item identifier="metalcrate" reward="2000" maxcount="10">
         <Item identifier="clownmask" amount="5"/>
         <Item identifier="clowncostume" amount="5"/>
         <Item identifier="bikehorn" amount="10"/>
@@ -1218,12 +1218,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="metalcrate" reward="200" maxcount="25">
+      <Item identifier="metalcrate" reward="800" maxcount="25">
         <Item identifier="iron" amount="10"/>
         <Item identifier="lead" amount="10"/>
         <Item identifier="copper" amount="10"/>
@@ -1240,12 +1240,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="metalcrate" reward="100" maxcount="25">
+      <Item identifier="metalcrate" reward="400" maxcount="25">
         <Item identifier="magnesium" amount="5"/>
         <Item identifier="copper" amount="5"/>
         <Item identifier="steel" amount="5"/>
@@ -1265,12 +1265,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="500"
+    reward="2000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="mediccrate" reward="120" maxcount="20">
+      <Item identifier="mediccrate" reward="480" maxcount="20">
         <Item identifier="antidama1" amount="5"/>
         <Item identifier="antidama2" amount="5"/>
         <Item identifier="antibloodloss1" amount="5"/>
@@ -1288,12 +1288,12 @@
     type="Cargo"
     difficulty="1"
     commonness="100"
-    reward="1000"
+    reward="4000"
     achievementidentifier="cargomission"
     requireddeliveryamount="0.98">
     <Reputation identifier="location" amount="1" amountforopposingfaction="-1" />
     <Items>
-      <Item identifier="mediccrate" reward="1000" maxcount="1">
+      <Item identifier="mediccrate" reward="4000" maxcount="1">
         <Item identifier="morbusineantidote" amount="5"/>
       </Item>
     </Items>
@@ -1310,7 +1310,7 @@
     type="Beacon"
     difficulty="1"
     Commonness="0"
-    reward="1000"
+    reward="4000"
     sideobjective="false">
     <Icon texture="Content/UI/MissionIcons.png" sourcerect="0,256,256,256" color="243,146,55"/>
     <message text="missionmessage0.beaconmission" />
@@ -1323,7 +1323,7 @@
     tags="beacon"
     type="Beacon"
     difficulty="2"
-    reward="1500"
+    reward="6000"
     minleveldifficulty="0"
     maxleveldifficulty="35"
     sideobjective="true">
@@ -1348,7 +1348,7 @@
     achievementidentifier="beaconmission"
     type="Beacon"
     difficulty="2"
-    reward="2000"
+    reward="8000"
     sideobjective="true"
     minleveldifficulty="35"
     maxleveldifficulty="50">
@@ -1378,7 +1378,7 @@
     achievementidentifier="beaconmission"
     type="Beacon"
     difficulty="3"
-    reward="2500"
+    reward="10000"
     sideobjective="true"
     minleveldifficulty="50"
     maxleveldifficulty="100">
@@ -1410,7 +1410,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroyhumans"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="2"
     commonness="100"
     allowretry="true"
@@ -1441,7 +1441,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroyhumans"
     type="OutpostDestroy"
-    reward="4000"
+    reward="16000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1473,7 +1473,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroyhumans"
     type="OutpostDestroy"
-    reward="6000"
+    reward="24000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1506,7 +1506,7 @@
     tags="abandonedoutpost"
     type="AbandonedOutpost"
     achievementidentifier="abandonedoutpostrescue"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1538,7 +1538,7 @@
     tags="abandonedoutpost"
     type="AbandonedOutpost"
     achievementidentifier="abandonedoutpostrescue"
-    reward="4500"
+    reward="18000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1570,7 +1570,7 @@
     tags="abandonedoutpost"
     type="AbandonedOutpost"
     achievementidentifier="abandonedoutpostrescue"
-    reward="6000"
+    reward="24000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1603,7 +1603,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1639,7 +1639,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="4500"
+    reward="18000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1677,7 +1677,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1711,7 +1711,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostassassinate"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1741,7 +1741,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostassassinate"
     type="OutpostDestroy"
-    reward="4500"
+    reward="18000"
     difficulty="4"
     commonness="100"
     allowretry="true"
@@ -1773,7 +1773,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -1801,7 +1801,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="50"
     allowretry="true"
@@ -1826,7 +1826,7 @@
     tags="abandonedoutpost"
     achievementidentifier="abandonedoutpostdestroymonsters"
     type="OutpostDestroy"
-    reward="5000"
+    reward="20000"
     difficulty="4"
     commonness="50"
     allowretry="true"
@@ -1852,7 +1852,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="3000"
+    reward="12000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1891,7 +1891,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="4000"
+    reward="16000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1929,7 +1929,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="5000"
+    reward="20000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1961,7 +1961,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="6000"
+    reward="24000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -1993,7 +1993,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="4500"
+    reward="18000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -2032,7 +2032,7 @@
     achievementidentifier="nestmission"
     type="Nest"
     spawntype="cave"
-    reward="6500"
+    reward="26000"
     itemspawnradius="800"
     approachitemsradius="800"
     monsterspawnradius="4000"
@@ -2074,7 +2074,7 @@
     commonness="100"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1200">
+    reward="4800">
     <Items>
       <Item identifier="quartz" />
       <Item identifier="quartz" />
@@ -2110,7 +2110,7 @@
     commonness="100"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1200">
+    reward="4800">
     <Items>
       <Item identifier="pyromorphite" />
       <Item identifier="pyromorphite" />
@@ -2146,7 +2146,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="1600">
+    reward="6400">
     <Items>
       <Item identifier="diamond" />
       <Item identifier="diamond" />
@@ -2181,7 +2181,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="1600">
+    reward="6400">
     <Items>
       <Item identifier="galena" />
       <Item identifier="galena" />
@@ -2217,7 +2217,7 @@
     commonness="100"
     resourceHandoverAmount="0.25"
     positionType="mainpath"
-    reward="1400">
+    reward="5600">
     <Items>
       <Item identifier="uraniumore" />
       <Item identifier="uraniumore" />
@@ -2248,7 +2248,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="2000">
+    reward="8000">
     <Items>
       <Item identifier="uraniumore" />
       <Item identifier="uraniumore" />
@@ -2283,7 +2283,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2100">
+    reward="8400">
     <Items>
       <Item identifier="triphylite" />
       <Item identifier="triphylite" />
@@ -2316,7 +2316,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2100">
+    reward="8400">
     <Items>
       <Item identifier="langbeinite" />
       <Item identifier="langbeinite" />
@@ -2349,7 +2349,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.25"
-    reward="2400">
+    reward="9600">
     <Items>
       <Item identifier="ilmenite" />
       <Item identifier="ilmenite" />
@@ -2384,7 +2384,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2700">
+    reward="10800">
     <Items>
       <Item identifier="thorianite" />
       <Item identifier="thorianite" />
@@ -2417,7 +2417,7 @@
     difficulty="2"
     commonness="100"
     resourceHandoverAmount="0.33"
-    reward="2700">
+    reward="10800">
     <Items>
       <Item identifier="titanite" />
       <Item identifier="titanite" />
@@ -2451,7 +2451,7 @@
     commonness="100"
     positionType="abysscave"
     resourceHandoverAmount="0.33"
-    reward="3600">
+    reward="14400">
     <Items>
       <Item identifier="physicorium" />
       <Item identifier="physicorium" />
@@ -2485,7 +2485,7 @@
     commonness="100"
     positionType="abysscave"
     resourceHandoverAmount="0.33"
-    reward="3600">
+    reward="14400">
     <Items>
       <Item identifier="fulgurium" />
       <Item identifier="fulgurium" />
@@ -2515,7 +2515,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35">
@@ -2536,7 +2536,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35">
@@ -2555,7 +2555,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission"
     baseescortedcharacters="2"
     scalingescortedcharacters="0.35">
@@ -2584,7 +2584,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35">
@@ -2616,7 +2616,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission">
     <Characters>
       <Character from="escortnpcs1" identifier="vip" escortidentifier="vip" color="238,130,238"/>
@@ -2637,7 +2637,7 @@
     type="Escort"
     difficulty="1"
     commonness="100"
-    reward="1500"
+    reward="6000"
     achievementidentifier="escortmission">
     <Characters>
       <Character from="combatmissionseparatistnpcs" identifier="separatistcaptain" escortidentifier="vip" color="238,130,238"/>
@@ -2656,7 +2656,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.3">
@@ -2677,7 +2677,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.3">
@@ -2696,7 +2696,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35"
@@ -2733,7 +2733,7 @@
     type="Escort"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     achievementidentifier="escortmission"
     baseescortedcharacters="1"
     scalingescortedcharacters="0.35"
@@ -2771,7 +2771,7 @@
     faction="separatists"
     difficulty="4"
     commonness="100"
-    reward="4000"
+    reward="16000"
     achievementidentifier="combatmissioncoalitionvsseparatists"
     addedmissiondifficultyperplayer="8">
     <Reputation identifier="coalition" amount="10" amountforopposingfaction="-10" />
@@ -2779,9 +2779,9 @@
     it's also possible to configure the submarines used in a pirate mission manually as follows.
     If these are left out, a random enemy submarine is chosen (provided there's a submarine that has a tag that matches one of the tags of this mission)
     <SubmarineTypes>
-      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="separatists" preferreddifficulty="10" alternatereward="3200"/>
-      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="separatists" preferreddifficulty="40" alternatereward="4400"/>
-      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="separatists" preferreddifficulty="70" alternatereward="5600"/>
+      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="separatists" preferreddifficulty="10" alternatereward="12800"/>
+      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="separatists" preferreddifficulty="40" alternatereward="17600"/>
+      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="separatists" preferreddifficulty="70" alternatereward="22400"/>
     </SubmarineTypes>    
     -->
     <Characters>
@@ -2823,7 +2823,7 @@
     faction="coalition"
     difficulty="4"
     commonness="100"
-    reward="4000"
+    reward="16000"
     achievementidentifier="combatmissionseparatistsvscoalition"
     addedmissiondifficultyperplayer="8">
     <Reputation identifier="separatists" amount="10" amountforopposingfaction="-10" />
@@ -2831,9 +2831,9 @@
     it's also possible to configure the submarines used in a pirate mission manually as follows.
     If these are left out, a random enemy submarine is chosen (provided there's a submarine that has a tag that matches one of the tags of this mission)
     <SubmarineTypes>
-      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="3200"/>
-      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="4400"/>
-      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="5600"/>
+      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="12800"/>
+      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="17600"/>
+      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="22400"/>
     </SubmarineTypes>    
     -->
     <Characters>
@@ -2886,9 +2886,9 @@
     it's also possible to configure the submarines used in a pirate mission manually as follows.
     If these are left out, a random enemy submarine is chosen (provided there's a submarine that has a tag that matches one of the tags of this mission)
     <SubmarineTypes>
-      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="3200"/>
-      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="4400"/>
-      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="5600"/>
+      <Submarine path="Content/Map/EnemySubmarines/DugongPirate.sub" faction="coalition" preferreddifficulty="10" alternatereward="12800"/>
+      <Submarine path="Content/Map/EnemySubmarines/HumpbackPirate.sub" faction="coalition" preferreddifficulty="40" alternatereward="17600"/>
+      <Submarine path="Content/Map/EnemySubmarines/Typhon2Pirate.sub" faction="coalition" preferreddifficulty="70" alternatereward="22400"/>
     </SubmarineTypes>    
     -->
     <Characters>
@@ -2985,7 +2985,7 @@
     requiredlocationfaction="separatists"
     achievementidentifier="jailbreak_coalition"
     type="jailbreak"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -3012,7 +3012,7 @@
     requiredlocationfaction="coalition"
     achievementidentifier="jailbreak_separatists"
     type="jailbreak"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="100"
     allowretry="true"
@@ -3039,7 +3039,7 @@
     achievementidentifier="jailbreak_sootman"
     type="jailbreak"
     alloworderingrescuees="false"
-    reward="3000"
+    reward="12000"
     difficulty="3"
     commonness="0"
     allowretry="true"
@@ -3125,7 +3125,7 @@
     type="Escort"
     description=""
     commonness="0"
-    reward="2000"
+    reward="8000"
     achievementidentifier="escortmission">
     <Characters>
       <Character from="customnpcs1" identifier="raptorowner" />
@@ -3146,7 +3146,7 @@
     tags="escort"
     type="Escort"
     commonness="0"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission">
     <Characters>
       <Item from="customnpcs1" identifier="radiationescapee" />
@@ -3166,7 +3166,7 @@
     tags="escort"
     type="Escort"
     commonness="0"
-    reward="1000"
+    reward="4000"
     achievementidentifier="escortmission">
     <Characters>
       <Item from="customnpcs1" identifier="eyeresearcher" />
@@ -3183,7 +3183,7 @@
     type="GoTo"
     difficulty="3"
     commonness="0"
-    reward="1000"
+    reward="4000"
     BlockLocationTypeChanges="true">
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="512,0,256,256" color="49,93,233"/>
     <TriggerEvent state="1" delay="5" eventidentifier="assassinationofjacovsubra4" campaignonly="true"/>
@@ -3194,7 +3194,7 @@
     identifier="huskcultspecialassassinate"
     type="OutpostDestroy"
     achievementidentifier="huskcultspecialassassinate"
-    reward="2000"
+    reward="8000"
     difficulty="4"
     commonness="0"
     allowretry="true"
@@ -3362,7 +3362,7 @@
     type="Monster"
     difficulty="2"
     commonness="100"
-    reward="2500"
+    reward="10000"
     maxsonarmarkerdistance="10000"
     monsterfile="Hammerhead_mNamed" count ="1">
     <Icon texture="Content/UI/MissionIcons2.png" sourcerect="512,768,256,256" color="214,50,48"/>
@@ -3377,7 +3377,7 @@
     description=""
     difficulty="3"
     commonness="100"
-    reward="4000"
+    reward="16000"
     sonarlabel="scantarget"
     targets="3"
     mintargetdistance="4000"
@@ -3413,7 +3413,7 @@
     type="ClearAlienRuins"
     difficulty="4"
     commonness="100"
-    reward="6000"
+    reward="24000"
     sonarlabel="target"
     targetitems="guardianpod"
     targetenemies="fractalguardian,fractalguardian2"
@@ -3437,7 +3437,7 @@
     type="ClearAlienRuins"
     difficulty="4"
     commonness="100"
-    reward="7000"
+    reward="28000"
     sonarlabel="target"
     targetitems="guardianpod"
     targetenemies="fractalguardian,fractalguardian2"
diff --git a/Content/Talents/Assistant/AfflictionsAssistant.xml b/Content/Talents/Assistant/AfflictionsAssistant.xml
index 643aa85a..4fa51812 100644
--- a/Content/Talents/Assistant/AfflictionsAssistant.xml
+++ b/Content/Talents/Assistant/AfflictionsAssistant.xml
@@ -12,8 +12,8 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
             resistancefor="damage"
-            minresistance="0.15"
-            maxresistance="0.15"
+            minresistance="0.3"
+            maxresistance="0.3"
             tag="provocative">
       <StatValue stattype="SoundRangeMultiplier" value="1.0" />
       <StatValue stattype="SightRangeMultiplier" value="1.0" />
@@ -33,9 +33,9 @@
     duration="1"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="SkillGainSpeed" value="0.2" />
-      <StatValue stattype="RepairSpeed" value="0.2" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.2" />
+      <StatValue stattype="SkillGainSpeed" value="0.8" />
+      <StatValue stattype="RepairSpeed" value="0.8" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.8" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,0" sheetelementsize="128,128" origin="0,0"/>
   </Affliction>
@@ -51,7 +51,7 @@
     duration="1"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="IncreaseFabricationQuality" value="1" />
+      <StatValue stattype="IncreaseFabricationQuality" value="2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,0" sheetelementsize="128,128" origin="0,0"/>
   </Affliction>
@@ -190,11 +190,11 @@
     hideiconafterdelay="true"
     maxstrength="1"
     treatmentthreshold="1000"
-    duration="5"
+    duration="8"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
-      minspeedmultiplier="1.3" 
-      maxspeedmultiplier="1.3"/>
+      minspeedmultiplier="1.45" 
+      maxspeedmultiplier="1.45"/>
     <icon texture="Content/UI/MainIconsAtlas.png" sourcerect="128,896,128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
   
@@ -209,12 +209,12 @@
     duration="5"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="ElectricalSkillBonus" value="10" />
-      <StatValue stattype="HelmSkillBonus" value="10" />
-      <StatValue stattype="MechanicalSkillBonus" value="10" />
-      <StatValue stattype="MedicalSkillBonus" value="10" />
-      <StatValue stattype="WeaponsSkillBonus" value="10" />
-      <StatValue stattype="RepairSpeed" value="0.25" />
+      <StatValue stattype="ElectricalSkillBonus" value="20" />
+      <StatValue stattype="HelmSkillBonus" value="20" />
+      <StatValue stattype="MechanicalSkillBonus" value="20" />
+      <StatValue stattype="MedicalSkillBonus" value="20" />
+      <StatValue stattype="WeaponsSkillBonus" value="20" />
+      <StatValue stattype="RepairSpeed" value="0.5" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,4" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -252,9 +252,9 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" 
             resistancefor="damage"
-            minresistance="0.05"
-            maxresistance="0.05">
-      <StatValue stattype="MovementSpeed" value="0.1" />
+            minresistance="0.1"
+            maxresistance="0.1">
+      <StatValue stattype="MovementSpeed" value="0.2" />
       <StatusEffect target="Character">
         <TriggerAnimation Type="Walk" filename="JollyWalk" priority="3" ExpectedSpecies="Human" />
       </StatusEffect>
@@ -268,13 +268,13 @@
     isbuff="true"
     limbspecific="false"
     maxstrength="120"
-    duration="120"
+    duration="180"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="120" strengthchange="-1" 
             resistancefor="damage" 
-            minresistance="0.3" 
-            maxresistance="0.3">
+            minresistance="0.45" 
+            maxresistance="0.45">
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="0,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -324,15 +324,15 @@
     isbuff="true"
     limbspecific="false"
     maxstrength="10"
-    duration="10"
+    duration="15"
     hideiconafterdelay="true"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="10">
-      <StatValue stattype="ElectricalSkillBonus" value="15" />
-      <StatValue stattype="HelmSkillBonus" value="15" />
-      <StatValue stattype="MechanicalSkillBonus" value="15" />
-      <StatValue stattype="MedicalSkillBonus" value="15" />
-      <StatValue stattype="WeaponsSkillBonus" value="15" />
+      <StatValue stattype="ElectricalSkillBonus" value="30" />
+      <StatValue stattype="HelmSkillBonus" value="30" />
+      <StatValue stattype="MechanicalSkillBonus" value="30" />
+      <StatValue stattype="MedicalSkillBonus" value="30" />
+      <StatValue stattype="WeaponsSkillBonus" value="30" />
       <StatusEffect target="Character">
         <TriggerAnimation Type="Walk" filename="JollyWalk" priority="3" ExpectedSpecies="Human" />
       </StatusEffect>
diff --git a/Content/Talents/Assistant/TalentsAssistant.xml b/Content/Talents/Assistant/TalentsAssistant.xml
index aef115b2..190689c6 100644
--- a/Content/Talents/Assistant/TalentsAssistant.xml
+++ b/Content/Talents/Assistant/TalentsAssistant.xml
@@ -3,7 +3,7 @@
   <Talent identifier="disloyalscum">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.disloyalscum">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="80" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -21,7 +21,7 @@
   <Talent identifier="loyalassistant">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.loyalassistant">
-      <Replace tag="[amount]" value="1" color="gui.green"/>
+      <Replace tag="[amount]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -39,8 +39,8 @@
   <Talent identifier="journeyman">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.journeyman">
-      <Replace tag="[skillamount]" value="10" color="gui.green"/>
-      <Replace tag="[skillspeedboost]" value="50" color="gui.green"/>
+      <Replace tag="[skillamount]" value="20" color="gui.green"/>
+      <Replace tag="[skillspeedboost]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -58,8 +58,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_captain" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="HelmSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -67,8 +67,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_doctor" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="MedicalSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -76,8 +76,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_security" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -85,8 +85,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_engineer" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -94,8 +94,8 @@
         <AbilityConditionHasTalent identifier="apprenticeship_mechanic" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="10"/>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillGainSpeed" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillGainSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -196,14 +196,14 @@
       <Replace tag="[itemname]" value="entityname.handhelditemfinder,entityname.makeshiftshelf" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.letitdrainreminder">
-      <Replace tag="[itemcount]" value="3" color="gui.green"/>
+      <Replace tag="[itemcount]" value="6" color="gui.green"/>
     </Description>
     <Migrations>
-      <AddStat version="1.0.10.0" statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="3" />
+      <AddStat version="1.0.10.0" statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="6" />
     </Migrations>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="3" />
+        <CharacterAbilityGivePermanentStat statidentifier="makeshiftshelf" stattype="MaxAttachableCount" value="6" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="makeshiftshelf"/>
@@ -214,7 +214,7 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.thefriendswemade"/>
     <Description tag="talentdescription.thefriendswemadereminder">
-      <Replace tag="[amount]" value="2" color="gui.green"/>
+      <Replace tag="[amount]" value="4" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.petraptoregg" color="gui.orange"/>
@@ -225,8 +225,8 @@
   <Talent identifier="revengesquad">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="5,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.revengesquad">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
-      <Replace tag="[duration]" value="120" color="gui.green"/>
+      <Replace tag="[amount]" value="45" color="gui.green"/>
+      <Replace tag="[duration]" value="240" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnDieToCharacter">
       <Abilities>
@@ -252,7 +252,7 @@
   <Talent identifier="peerlearning">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.peerlearning">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <!-- give XP to the character itself -->
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -260,7 +260,7 @@
         <AbilityConditionLowestLevel />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.5"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <!-- allies too -->
@@ -269,7 +269,7 @@
         <AbilityConditionLowestLevel />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.5"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -295,8 +295,8 @@
   <Talent identifier="mailman">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.mailman">
-      <Replace tag="[xpbonus]" value="25" color="gui.green"/>
-      <Replace tag="[moneybonus]" value="250" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="100" color="gui.green"/>
+      <Replace tag="[moneybonus]" value="500" color="gui.green"/>
       <Replace tag="[missiontype]" value="missiontype.cargo" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -304,7 +304,7 @@
         <AbilityConditionMission missiontype="Cargo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.25"/>
+        <CharacterAbilityModifyValue multiplyvalue="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionMoney">
@@ -312,7 +312,7 @@
         <AbilityConditionMission missiontype="Cargo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveMoney amount="250"/>
+        <CharacterAbilityGiveMoney amount="500"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -320,16 +320,16 @@
   <Talent identifier="thewaitinglist">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.thewaitinglist">
-      <Replace tag="[amount]" value="75" color="gui.green"/>
+      <Replace tag="[amount]" value="90" color="gui.green"/>
     </Description>
     <AbilityGroupInterval>
       <Conditions>
         <AbilityConditionAboveVitality invert="true" vitalitypercentage="0"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyResistance resistanceid="oxygenlow" multiplier="0.25" />
-        <CharacterAbilityModifyResistance resistanceid="bleeding" multiplier="0.25" />
-        <CharacterAbilityModifyResistance resistanceid="bloodloss" multiplier="0.25" />
+        <CharacterAbilityModifyResistance resistanceid="oxygenlow" multiplier="0.1" />
+        <CharacterAbilityModifyResistance resistanceid="bleeding" multiplier="0.1" />
+        <CharacterAbilityModifyResistance resistanceid="bloodloss" multiplier="0.1" />
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -352,13 +352,13 @@
   <Talent identifier="skedaddle">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="5,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.skedaddle">
-      <Replace tag="[value]" value="10" color="gui.green"/>
-      <Replace tag="[attackedvalue]" value="30" color="gui.green"/>
-      <Replace tag="[seconds]" value="5" color="gui.green"/>
+      <Replace tag="[value]" value="15" color="gui.green"/>
+      <Replace tag="[attackedvalue]" value="45" color="gui.green"/>
+      <Replace tag="[seconds]" value="8" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.1"/>
+        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.15"/>
       </Abilities>
     </AbilityGroupEffect>    
     <AbilityGroupEffect abilityeffecttype="OnAttacked">
@@ -377,14 +377,14 @@
   <Talent identifier="insurancepolicy">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.insurancepolicy">
-      <Replace tag="[amount]" value="200" color="gui.green"/>
+      <Replace tag="[amount]" value="400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnDieToCharacter">
       <Conditions>
         <AbilityConditionCharacter invert="true" targettypes="Ally" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityInsurancePolicy moneypermission="200" requiresalive="false" />
+        <CharacterAbilityInsurancePolicy moneypermission="400" requiresalive="false" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -392,9 +392,9 @@
   <Talent identifier="nonthreatening">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.feigndeath">
-      <Replace tag="[seconds]" value="2" color="gui.green"/>
+      <Replace tag="[seconds]" value="1" color="gui.green"/>
     </Description>
-    <AbilityGroupInterval effectdelay="2" >
+    <AbilityGroupInterval effectdelay="1" >
       <Conditions>
         <AbilityConditionRagdolled/>
       </Conditions>
@@ -408,7 +408,7 @@
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="1,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.tastytarget"/>
     <Description tag="talentdescription.damagereduction">
-      <Replace tag="[amount]" value="15" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -428,18 +428,18 @@
     <Description tag="talentdescription.starterquest" />
 
     <Description tag="talentdescription.starterquest.killcrawler">
-      <Replace tag="[xpbonus]" value="400" color="gui.green"/>
-      <Replace tag="[skillbonus]" value="10" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="1600" color="gui.green"/>
+      <Replace tag="[skillbonus]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.weaponsskillbonus" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.starterquest.repairjunctionbox">
-      <Replace tag="[xpbonus]" value="300" color="gui.green"/>
-      <Replace tag="[skillbonus]" value="10" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="1200" color="gui.green"/>
+      <Replace tag="[skillbonus]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.electricalskillbonus" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.starterquest.weldleak">
-      <Replace tag="[xpbonus]" value="200" color="gui.green"/>
-      <Replace tag="[skillbonus]" value="10" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="800" color="gui.green"/>
+      <Replace tag="[skillbonus]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.mechanicalskillbonus" color="gui.orange"/>
     </Description>
 
@@ -461,8 +461,8 @@
         <AbilityConditionHasPermanentStat statidentifier="starterquest_killcrawler" min="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="400"/>
-        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="starterquest" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="1600"/>
+        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="starterquest" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="starterquest_killcrawler" />
       </Abilities>
     </AbilityGroupEffect>
@@ -474,8 +474,8 @@
         <AbilityConditionHasPermanentStat statidentifier="starterquest_repairjunctionbox" min="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="300"/>
-        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="starterquest" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="1200"/>
+        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="starterquest" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="starterquest_repairjunctionbox" />
       </Abilities>
     </AbilityGroupEffect>
@@ -486,8 +486,8 @@
         <AbilityConditionHasPermanentStat statidentifier="starterquest_weldleak" min="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="200"/>
-        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="starterquest" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="800"/>
+        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="starterquest" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="starterquest_weldleak" />
       </Abilities>
     </AbilityGroupEffect>
@@ -496,15 +496,15 @@
   <Talent identifier="indenturedservitude">
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="4,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.assistanthiringprice">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.otherassistantxpbonus">
-      <Replace tag="[bonus]" value="10" color="gui.green"/>
-      <Replace tag="[max]" value="50" color="gui.green"/>
+      <Replace tag="[bonus]" value="40" color="gui.green"/>
+      <Replace tag="[max]" value="400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="HireCostMultiplier" statidentifier="assistant" value="-0.2" />
+        <CharacterAbilityGivePermanentStat stattype="HireCostMultiplier" statidentifier="assistant" value="-0.4" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnRoundEnd">
@@ -520,7 +520,7 @@
         <AbilityConditionHasPermanentStat statidentifier="indenturedservitude" targetAbilityTarget="true" min="5" invert="true"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.1"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.4"/>
         <CharacterAbilityGivePermanentStat statidentifier="indenturedservitude" targetAbilityTarget="true" value="1" maxvalue="5" />
       </Abilities>
     </AbilityGroupEffect>
@@ -529,7 +529,7 @@
   <Talent identifier="jengamaster">
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.jengamaster">
-      <Replace tag="[amount]" value="4" color="gui.green"/>
+      <Replace tag="[amount]" value="8" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <AbilityGroupEffect abilityeffecttype="OnItemSelected">
@@ -538,7 +538,7 @@
         <AbilityConditionItemIsStatic />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStat stattype="ExtraStackSize" value="4" stackable="false" save="true"/>
+        <CharacterAbilityGiveItemStat stattype="ExtraStackSize" value="8" stackable="false" save="true"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -546,11 +546,11 @@
   <Talent identifier="mule">
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.mule">
-      <Replace tag="[amount]" value="2" color="gui.green"/>
+      <Replace tag="[amount]" value="4" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="InventoryExtraStackSize" statidentifier="Material" value="2" />
+        <CharacterAbilityGivePermanentStat stattype="InventoryExtraStackSize" statidentifier="Material" value="4" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -559,18 +559,18 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.reductiontostattypeself">
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
-      <Replace tag="[amount]" value="40" color="gui.red"/>
+      <Replace tag="[amount]" value="20" color="gui.red"/>
     </Description>
     <Description tag="talentdescription.reductiontoallskills">
-      <Replace tag="[amount]" value="15" color="gui.red"/>
+      <Replace tag="[amount]" value="8" color="gui.red"/>
     </Description>
     <Description tag="talentdescription.crewlayabout">
-      <Replace tag="[repairspeed]" value="25" color="gui.green"/>
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[repairspeed]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="1">
       <Abilities>
-        <CharacterAbilityApplyStatusEffectsToAllies maxdistance="600" allowself="false">
+        <CharacterAbilityApplyStatusEffectsToAllies maxdistance="1200" allowself="false">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" disabledeltatime="true" multiplyafflictionsbymaxvitality="true">
               <Affliction identifier="pickinguptheslack" strength="1.0"/>
@@ -581,12 +581,12 @@
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="-15"/>
-        <CharacterAbilityGiveStat stattype="RepairSpeed" value="-0.4"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="8"/>
+        <CharacterAbilityGiveStat stattype="RepairSpeed" value="-0.2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -612,15 +612,15 @@
   <Talent identifier="playingcatchup">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.playingcatchup">
-      <Replace tag="[levelvalue]" value="2" color="gui.green"/>
-      <Replace tag="[experiencevalue]" value="100" color="gui.green"/>
+      <Replace tag="[levelvalue]" value="4" color="gui.green"/>
+      <Replace tag="[experiencevalue]" value="400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
       <Conditions>
-        <AbilityConditionLevelsBehindHighest levelsbehind="2" />
+        <AbilityConditionLevelsBehindHighest levelsbehind="4" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="2"/>
+        <CharacterAbilityModifyValue multiplyvalue="5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -632,11 +632,11 @@
     </Description>
     <Description tag="talentdescription.clownpowerbenefits"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.movementspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="5" color="gui.green"/>
+      <Replace tag="[amount]" value="10" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -666,7 +666,7 @@
     </Description>
     <Description tag="talentdescription.clownpowerbenefits"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.swimmingspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval>
@@ -674,7 +674,7 @@
         <AbilityConditionHasAffliction afflictionidentifier="clownpower" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="SwimmingSpeed" value="0.5"/>
+        <CharacterAbilityModifyStat stattype="SwimmingSpeed" value="1"/>
       </Abilities>
     </AbilityGroupInterval>
     <AddedRecipe itemidentifier="clowndivingmask"/>
@@ -684,14 +684,14 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.psychoclown">
       <Replace tag="[afflictionname]" value="afflictionname.clownpower" color="gui.orange"/>
-      <Replace tag="[maxattackspeed]" value="150" color="gui.green"/>
+      <Replace tag="[maxattackspeed]" value="300" color="gui.green"/>
     </Description>
     <AbilityGroupInterval>
       <Conditions>
         <AbilityConditionHasAffliction afflictionidentifier="clownpower" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityPsychoClown stattype="MeleeAttackSpeed" maxvalue="1.5" afflictionidentifier="psychosis"/>
+        <CharacterAbilityPsychoClown stattype="MeleeAttackSpeed" maxvalue="3" afflictionidentifier="psychosis"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -700,8 +700,8 @@
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,3" sheetelementsize="128,128"/>
     <!-- TODO mention it works on all instruments -->
     <Description tag="talentdescription.inspiringtunes">
-      <Replace tag="[skillamount]" value="15" color="gui.green"/>
-      <Replace tag="[duration]" value="10" color="gui.green"/>
+      <Replace tag="[skillamount]" value="30" color="gui.green"/>
+      <Replace tag="[duration]" value="15" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
@@ -722,21 +722,21 @@
   <Talent identifier="chonkyhonks">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.chonkyhonks">
-      <Replace tag="[chance]" value="50" color="gui.green"/>
-      <Replace tag="[duration]" value="1" color="gui.green"/>
+      <Replace tag="[chance]" value="75" color="gui.green"/>
+      <Replace tag="[duration]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
         <AbilityConditionItem tags="hornitem"/>
         <AbilityConditionHasAffliction afflictionidentifier="clownpower" />
-        <AbilityConditionServerRandom randomchance="0.5" />
+        <AbilityConditionServerRandom randomchance="0.75" />
       </Conditions>
       <Abilities>
         <!-- TODO loud sound? -->
-        <CharacterAbilityApplyStatusEffectToNonHumans maxdistance="600">
+        <CharacterAbilityApplyStatusEffectToNonHumans maxdistance="1200">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" multiplyafflictionsbymaxvitality="true">
-              <Affliction identifier="stun" strength="1.0"/>
+              <Affliction identifier="stun" strength="2"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffectToNonHumans>
@@ -748,7 +748,7 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.truepotentialtemporary">
       <Replace tag="[affliction]" value="afflictionname.combatstimulant" color="gui.orange"/>
-      <Replace tag="[duration]" value="15" color="gui.green"/>
+      <Replace tag="[duration]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.clownexosuit" color="gui.orange"/>
@@ -760,7 +760,7 @@
         <AbilityConditionAttackData itemidentifier="toyhammer" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveAffliction affliction="combatstimulant" strength="15" setvalue="true" />
+        <CharacterAbilityGiveAffliction affliction="combatstimulant" strength="30" setvalue="true" />
         <CharacterAbilityReduceAffliction affliction="oxygenlow" amount="200" />
       </Abilities>
     </AbilityGroupEffect>
diff --git a/Content/Talents/Captain/AfflictionsCaptain.xml b/Content/Talents/Captain/AfflictionsCaptain.xml
index ecb0db3b..4527e4e7 100644
--- a/Content/Talents/Captain/AfflictionsCaptain.xml
+++ b/Content/Talents/Captain/AfflictionsCaptain.xml
@@ -23,7 +23,7 @@
     isbuff="true"
     limbspecific="false"
     maxstrength="1"
-    duration="5"
+    duration="7.5"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
@@ -73,9 +73,9 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
             resistancefor="damage,stun"
-            minresistance="0.2"
-            maxresistance="0.2">
-      <StatValue stattype="MeleeAttackMultiplier" value="0.2" />
+            minresistance="0.4"
+            maxresistance="0.4">
+      <StatValue stattype="MeleeAttackMultiplier" value="0.4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -92,9 +92,9 @@
     treatmentthreshold="1000"
     iconcolors="227,247,249">
     <Effect minstrength="0" maxstrength="10" strengthchange="-1">
-      <StatValue stattype="RepairSpeed" value="0.2" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.2" />
-      <StatValue stattype="MovementSpeed" value="0.05" />
+      <StatValue stattype="RepairSpeed" value="0.4" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.4" />
+      <StatValue stattype="MovementSpeed" value="0.1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="4,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -112,7 +112,7 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
       <!-- 100% XP boost -->
-      <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="0.25"/>
+      <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="1"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,7" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -130,7 +130,7 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
       <!-- +2 level -->
-      <StatValue stattype="ExtraLevelGain" value="2"/>
+      <StatValue stattype="ExtraLevelGain" value="4"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="6,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -147,9 +147,9 @@
     showbarinhealthmenu="false"
     iconcolors="227,247,249">
     <Effect minstrength="0" maxstrength="10" strengthchange="-1">
-      <StatValue stattype="RepairSpeed" value="0.4" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.4" />
-      <StatValue stattype="MovementSpeed" value="0.1" />
+      <StatValue stattype="RepairSpeed" value="0.8" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.8" />
+      <StatValue stattype="MovementSpeed" value="0.2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="5,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -166,10 +166,10 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="HelmSkillBonus" value="20" />
-      <StatValue stattype="WeaponsSkillBonus" value="20" />
-      <StatValue stattype="WeaponsSkillGainSpeed" value="1" />
-      <StatValue stattype="HelmSkillGainSpeed" value="1" />
+      <StatValue stattype="HelmSkillBonus" value="40" />
+      <StatValue stattype="WeaponsSkillBonus" value="40" />
+      <StatValue stattype="WeaponsSkillGainSpeed" value="4" />
+      <StatValue stattype="HelmSkillGainSpeed" value="4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -182,12 +182,12 @@
     hideiconafterdelay="true"
     showiconthreshold="1"
     maxstrength="1"
-    duration="60"
+    duration="120"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.5" /> <!-- +50% -->
-      <StatValue stattype="SwimmingSpeed" value="0.5" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="1" /> <!-- +50% -->
+      <StatValue stattype="SwimmingSpeed" value="1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,7" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -288,7 +288,7 @@
   showinhealthscannerthreshold="1000"
   iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="SwimmingSpeed" value="0.1" />
+      <StatValue stattype="SwimmingSpeed" value="0.2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,7" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -307,7 +307,7 @@
   showinhealthscannerthreshold="1000"
   iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="WalkingSpeed" value="0.05" />
+      <StatValue stattype="WalkingSpeed" value="0.1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,3" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -323,8 +323,8 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1"
             resistancefor="damage"
-            minresistance="0.05"
-            maxresistance="0.05"/>
+            minresistance="0.1"
+            maxresistance="0.1"/>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="3,3" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
 </Afflictions>
diff --git a/Content/Talents/Captain/TalentsCaptain.xml b/Content/Talents/Captain/TalentsCaptain.xml
index 3f676bf3..ce0b87ce 100644
--- a/Content/Talents/Captain/TalentsCaptain.xml
+++ b/Content/Talents/Captain/TalentsCaptain.xml
@@ -19,10 +19,10 @@
   <Talent identifier="steadytune">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.steadytune">
-      <Replace tag="[duration]" value="10" color="gui.green"/>
+      <Replace tag="[duration]" value="15" color="gui.green"/>
       <Replace tag="[buffamount]" value="100" color="gui.green"/>
       <Replace tag="[buffname]" value="afflictionname.psychosisresistance" color="gui.orange"/>
-      <Replace tag="[buffduration]" value="60" color="gui.green"/>
+      <Replace tag="[buffduration]" value="90" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
@@ -44,10 +44,10 @@
         <AbilityConditionHasAffliction afflictionidentifier="steadytune_charging" minimumpercentage="0.9"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityApplyStatusEffectsToAllies range="600">
+        <CharacterAbilityApplyStatusEffectsToAllies range="12000">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" interval="1" disabledeltatime="true">
-              <Affliction identifier="psychosisimmunity" amount="60" />
+              <Affliction identifier="psychosisimmunity" amount="90" />
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffectsToAllies>
@@ -58,8 +58,8 @@
   <Talent identifier="inspiringpresence">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="5,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.inspiringpresence">
-      <Replace tag="[amount]" value="3" color="gui.green"/>
-      <Replace tag="[movespeed]" value="5" color="gui.green"/>
+      <Replace tag="[amount]" value="6" color="gui.green"/>
+      <Replace tag="[movespeed]" value="10" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -88,7 +88,7 @@
   <Talent identifier="trickledown">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.trickledown">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainSkillPoint">
       <Abilities>
@@ -111,21 +111,21 @@
   <Talent identifier="helmsman">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.helmsman">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.increaseeffectiveness">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="30"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="60"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="pump" stattype="PumpSpeed" stackable="false" value="1.2" />
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineSpeed" stackable="false" value="1.2" />
+        <CharacterAbilityGiveItemStatToTags tags="pump" stattype="PumpSpeed" stackable="false" value="0.4" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineSpeed" stackable="false" value="0.4" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -140,15 +140,15 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.leadingbyexample" />
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairtoolstructurerepairmultiplier" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="5" color="gui.green"/>
+      <Replace tag="[amount]" value="10" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.movementspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
@@ -185,11 +185,11 @@
   <Talent identifier="campaigning">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="5,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.campaigning">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="campaigning" stattype="ShipyardBuyMultiplierAffiliated" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="campaigning" stattype="ShipyardBuyMultiplierAffiliated" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -197,18 +197,18 @@
   <Talent identifier="networking">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.networking">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <Migrations>
       <UpdateStatIdentifier version="1.0.10.0" old="networking" new="all~networking" />
     </Migrations>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="all~networking" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="coalition" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="clowns" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="huskcult" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="separatists" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="all~networking" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="coalition" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="clowns" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="huskcult" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="separatists" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -216,11 +216,11 @@
   <Talent identifier="figurehead">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.figurehead">
-      <Replace tag="[selfxpgain]" value="550" color="gui.green"/>
-      <Replace tag="[level]" value="5" color="gui.green"/>
+      <Replace tag="[selfxpgain]" value="2200" color="gui.green"/>
+      <Replace tag="[level]" value="7.5" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.factiondiscount">
-      <Replace tag="[discount]" value="10" color="gui.green"/>
+      <Replace tag="[discount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
       <Conditions>
@@ -228,7 +228,7 @@
       </Conditions>
       <Abilities>
         <!-- -550 XP to negate the default bonus given by the medal -->
-        <CharacterAbilityGiveExperience level="5" amount="-550"/>
+        <CharacterAbilityGiveExperience level="7.5" amount="-1100"/>
       </Abilities>
     </AbilityGroupEffect>
     <Migrations>
@@ -236,8 +236,8 @@
     </Migrations>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="StoreBuyMultiplierAffiliated" value="0.1" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="ShipyardBuyMultiplierAffiliated" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="StoreBuyMultiplierAffiliated" value="0.2" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="all~figurehead" stattype="ShipyardBuyMultiplierAffiliated" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -245,17 +245,17 @@
   <Talent identifier="affiliation" abilityeffectsstackwithsametalent="false">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.affiliationreputation">
-      <Replace tag="[reputationincrease]" value="50" color="gui.green"/>
+      <Replace tag="[reputationincrease]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.affiliationbenefit">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <Description linebreak="true"/>
     <Description tag="talentdescription.affiliationfactionreminder"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ReputationGainMultiplier" value="0.5" />
+        <CharacterAbilityGiveStat stattype="ReputationGainMultiplier" value="1" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionMoney">
@@ -263,7 +263,7 @@
         <AbilityConditionMission isaffiliated="true"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyValue="1.1"/>
+        <CharacterAbilityModifyValue multiplyValue="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -271,12 +271,12 @@
   <Talent identifier="yourreputation">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.yourreputation">
-      <Replace tag="[amount]" value="200" color="gui.green"/>
+      <Replace tag="[amount]" value="400" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.extramission"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ExtraMissionCount" value="1"/>
+        <CharacterAbilityGiveStat stattype="ExtraMissionCount" value="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnLocationDiscovered">
@@ -284,7 +284,7 @@
         <AbilityConditionLocation hasoutpost="true" ispositivereputation="true"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveMoney amount="200"/>
+        <CharacterAbilityGiveMoney amount="400"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnLocationDiscovered">
@@ -301,10 +301,10 @@
   <Talent identifier="bigguns">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.bigguns">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.reducedualwieldpenalty">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.handcannon, entityname.handcannonround" color="gui.orange"/>
@@ -317,12 +317,12 @@
         <AbilityConditionAttackData tags="pistolammoitem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.3" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.6" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.6"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -331,20 +331,20 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.lonewolf"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.stunresistance" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.meleedamagebonus" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
-        <AbilityConditionAllyNearby distance="2000" truthywhen="NoCharacterMatches"/>
+        <AbilityConditionAllyNearby distance="1000" truthywhen="NoCharacterMatches"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -361,8 +361,8 @@
   <Talent identifier="deputy">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.deputy">
-      <Replace tag="[skillbonus1]" value="20" color="gui.green"/>
-      <Replace tag="[skillbonus2]" value="20" color="gui.green"/>
+      <Replace tag="[skillbonus1]" value="40" color="gui.green"/>
+      <Replace tag="[skillbonus2]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -389,8 +389,8 @@
   <Talent identifier="logisticsexpert">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.logisticsexpert">
-      <Replace tag="[xpbonus]" value="20" color="gui.green"/>
-      <Replace tag="[moneybonus]" value="20" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="80" color="gui.green"/>
+      <Replace tag="[moneybonus]" value="80" color="gui.green"/>
       <Replace tag="[missiontype1]" value="missiontype.cargo" color="gui.orange"/>
       <Replace tag="[missiontype2]" value="missiontype.personneltransport" color="gui.orange"/>
     </Description>
@@ -399,7 +399,7 @@
         <AbilityConditionMission missiontype="Cargo,Escort"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.2"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.8"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -407,7 +407,7 @@
         <AbilityConditionMission missiontype="Cargo,Escort"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.2"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.8"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -415,13 +415,13 @@
   <Talent identifier="prodigy">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.skillgainspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval>
       <Abilities>
         <!-- 1 = +100% -->
-        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="0.5"/> 
+        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="2"/> 
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -430,7 +430,7 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.appliestoallcrew"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.skillgainspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
@@ -449,21 +449,21 @@
   <Talent identifier="veteran">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.veteran">
-      <Replace tag="[helmbonus]" value="20" color="gui.green"/>
-      <Replace tag="[otherbonus]" value="5" color="gui.green"/>
+      <Replace tag="[helmbonus]" value="40" color="gui.green"/>
+      <Replace tag="[otherbonus]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="20"/>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="5"/>
-        <CharacterAbilityGiveStat stattype="RepairSpeed" value="0.1"/>
+        <CharacterAbilityGiveStat stattype="HelmSkillBonus" value="40"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MechanicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="RepairSpeed" value="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -471,10 +471,10 @@
   <Talent identifier="quickdraw">
     <Description tag="talentdescription.quickdraw">
       <Replace tag="[seconds]" value="8" color="gui.green"/>
-      <Replace tag="[damage]" value="25" color="gui.green"/>
+      <Replace tag="[damage]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.reducedualwieldpenalty">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="75" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,0" sheetelementsize="128,128"/>
     <AbilityGroupInterval interval="1">
@@ -494,7 +494,7 @@
         <AbilityConditionAttackData tags="pistolammoitem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.25"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
@@ -514,14 +514,14 @@
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="DualWieldingPenaltyReduction" value="0.75"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="sailorwithnoname">
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.medical" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -530,7 +530,7 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,1" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="40"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="cigar"/>
@@ -539,7 +539,7 @@
 
   <Talent identifier="drunkensailor">
     <Description tag="talentdescription.drunkensailor">
-      <Replace tag="[stunresistance]" value="75" color="gui.green"/>
+      <Replace tag="[stunresistance]" value="93.75" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.rum" color="gui.orange"/>
@@ -550,7 +550,7 @@
         <AbilityConditionHasAffliction afflictionidentifier="drunknodebuffs"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyResistance resistanceid="stun" multiplier="0.25"/>
+        <CharacterAbilityModifyResistance resistanceid="stun" multiplier="0.06"/>
         <CharacterAbilityModifyResistance resistanceid="nausea" multiplier="0"/>
       </Abilities>
     </AbilityGroupInterval>
@@ -564,8 +564,8 @@
 
   <Talent identifier="bountyhunter">
     <Description tag="talentdescription.logisticsexpert">
-      <Replace tag="[xpbonus]" value="15" color="gui.green"/>
-      <Replace tag="[moneybonus]" value="15" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="60" color="gui.green"/>
+      <Replace tag="[moneybonus]" value="60" color="gui.green"/>
       <Replace tag="[missiontype1]" value="missiontype.monster" color="gui.orange"/>
       <Replace tag="[missiontype2]" value="missiontype.nest" color="gui.orange"/>
     </Description>
@@ -575,7 +575,7 @@
         <AbilityConditionMission missiontype="Monster,Nest"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.15"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.6"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -583,17 +583,17 @@
         <AbilityConditionMission missiontype="Monster,Nest"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.15"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.6"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="travelingtradesman">
     <Description tag="talentdescription.appliestoallcrew">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.specialsaleitemincrease">
-      <Replace tag="[itemcount]" value="3" color="gui.green"/>
+      <Replace tag="[itemcount]" value="6" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
       <Replace tag="[amount]" value="20" color="gui.green"/>
@@ -603,8 +603,8 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,0" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ExtraSpecialSalesCount" value="3"/>
-        <CharacterAbilityGivePermanentStat statidentifier="all" stattype="StoreSellMultiplier" value="0.2" setvalue="true" />
+        <CharacterAbilityGiveStat stattype="ExtraSpecialSalesCount" value="6"/>
+        <CharacterAbilityGivePermanentStat statidentifier="all" stattype="StoreSellMultiplier" value="0.4" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -633,9 +633,9 @@
   <Talent identifier="downwiththeship">
     <Description tag="talentdescription.downwiththeship">
       <Replace tag="[flooded]" value="50" color="gui.green"/>
-      <Replace tag="[swimmingboost]" value="50" color="gui.green"/>
-      <Replace tag="[repairspeed]" value="50" color="gui.green"/>
-      <Replace tag="[duration]" value="60" color="gui.green"/>
+      <Replace tag="[swimmingboost]" value="100" color="gui.green"/>
+      <Replace tag="[repairspeed]" value="100" color="gui.green"/>
+      <Replace tag="[duration]" value="90" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,1" sheetelementsize="128,128"/>
     <AbilityGroupInterval interval="1">
@@ -656,7 +656,7 @@
   
   <Talent identifier="commendations">
     <Description tag="talentdescription.commendations">
-      <Replace tag="[selfxpgain]" value="275" color="gui.green"/>
+      <Replace tag="[selfxpgain]" value="17600" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,1" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
@@ -674,8 +674,8 @@
 
   <Talent identifier="camaraderie">
     <Description tag="talentdescription.camaraderienew">
-      <Replace tag="[extraexperience]" value="10" color="gui.green"/>
-      <Replace tag="[resistanceamount]" value="5" color="gui.green"/>
+      <Replace tag="[extraexperience]" value="40" color="gui.green"/>
+      <Replace tag="[resistanceamount]" value="10" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.assistantsdontcount"/>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="5,1" sheetelementsize="128,128"/>
@@ -684,7 +684,7 @@
         <AbilityConditionNoCrewDied/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.1"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.4"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="0.9">
diff --git a/Content/Talents/Doctor/AfflictionsDoctor.xml b/Content/Talents/Doctor/AfflictionsDoctor.xml
index e73625e4..d67b0fa2 100644
--- a/Content/Talents/Doctor/AfflictionsDoctor.xml
+++ b/Content/Talents/Doctor/AfflictionsDoctor.xml
@@ -92,7 +92,7 @@
     <Effect
       minstrength="0"
       maxstrength="600">
-      <StatValue stattype="MedicalSkillBonus" value="30" />
+      <StatValue stattype="MedicalSkillBonus" value="60" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="4,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -110,8 +110,8 @@
     <Effect
       minstrength="0"
       maxstrength="1">
-      <StatValue stattype="MovementSpeed" value="0.05" />
-      <StatValue stattype="MaximumHealthMultiplier" value="0.10" />
+      <StatValue stattype="MovementSpeed" value="0.1" />
+      <StatValue stattype="MaximumHealthMultiplier" value="0.2" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="7,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -148,7 +148,7 @@
     showinhealthscannerthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" strengthchange="-1">
-      <StatValue stattype="MovementSpeed" value="0.4"/>
+      <StatValue stattype="MovementSpeed" value="0.6"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="5,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -168,7 +168,7 @@
     showinhealthscannerthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" strengthchange="-1">
-      <StatValue stattype="CPRBoost" value="0.2"/>
+      <StatValue stattype="CPRBoost" value="0.4"/>
     </Effect>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,1" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -187,7 +187,7 @@
       minstrength="0"
       maxstrength="60"
       strengthchange="0">
-      <StatValue stattype="MaximumHealthMultiplier" value="0.2" />
+      <StatValue stattype="MaximumHealthMultiplier" value="0.4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,6" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
diff --git a/Content/Talents/Doctor/TalentsDoctor.xml b/Content/Talents/Doctor/TalentsDoctor.xml
index a31805eb..d2445b56 100644
--- a/Content/Talents/Doctor/TalentsDoctor.xml
+++ b/Content/Talents/Doctor/TalentsDoctor.xml
@@ -3,10 +3,10 @@
   <Talent identifier="macrodosing">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.increaseappliedbuffduration">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.poisonsincreased">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.endocrinebooster" color="gui.orange"/>
@@ -14,8 +14,8 @@
     <Description tag="entitydescription.endocrinebooster" />
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.25"/>
-        <CharacterAbilityGiveStat stattype="PoisonMultiplier" value="1.0"/>
+        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="PoisonMultiplier" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="endocrinebooster"/>
@@ -24,15 +24,15 @@
   <Talent identifier="labcontacts">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.chemicalsboughtcheaper">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.constructmedicinefaster">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="FabricationSpeed" value="1" setvalue="true"/>
-        <CharacterAbilityGivePermanentStat statidentifier="chem" stattype="StoreBuyMultiplier" value="0.3" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="FabricationSpeed" value="2" setvalue="true"/>
+        <CharacterAbilityGivePermanentStat statidentifier="chem" stattype="StoreBuyMultiplier" value="0.6" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -49,12 +49,12 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.blackmarketgenes"/>
     <Description tag="talentdescription.sellgeneticmaterialsmultiplier">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="unidentifiedgeneticmaterial" stattype="StoreSellMultiplier" value="0.5" setvalue="true" />
-        <CharacterAbilityGivePermanentStat statidentifier="geneticmaterial" stattype="StoreSellMultiplier" value="0.5" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="unidentifiedgeneticmaterial" stattype="StoreSellMultiplier" value="1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="geneticmaterial" stattype="StoreSellMultiplier" value="1" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedStoreItem itemtag="blackmarketgenes" />
@@ -85,7 +85,7 @@
   <Talent identifier="medicalassistance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.medicalassistance">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -104,7 +104,7 @@
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.assistantdragatfullspeed"/>
     <Description tag="talentdescription.emergencyresponse">
-      <Replace tag="[movementspeed]" value="40" color="gui.green"/>
+      <Replace tag="[movementspeed]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
@@ -137,11 +137,11 @@
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.medicalexpertise">
       <Replace tag="[skill]" value="skillname.medical" color="gui.orange"/>
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="30"/>
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="60"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnApplyTreatment">
@@ -153,8 +153,8 @@
           <StatusEffects>
             <!-- improve bandage effectiveness -->
             <StatusEffect tags="medical" type="OnAbility" target="Limb" duration="6.0">
-              <ReduceAffliction type="bleeding" amount="1.5" />
-              <ReduceAffliction type="burn" amount="1.5" />
+              <ReduceAffliction type="bleeding" amount="2.25" />
+              <ReduceAffliction type="burn" amount="2.25" />
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -165,8 +165,8 @@
   <Talent identifier="genetampering">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.genetampering">
-      <Replace tag="[healthamount]" value="10" color="gui.green"/>
-      <Replace tag="[movementspeed]" value="5" color="gui.green"/>
+      <Replace tag="[healthamount]" value="20" color="gui.green"/>
+      <Replace tag="[movementspeed]" value="10" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -217,7 +217,7 @@
         <CharacterAbilityApplyStatusEffects>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="UseTarget" spawnitemrandomly="true" >
-              <SpawnItem identifiers="alienblood" spawnposition="ThisInventory" />
+              <SpawnItem identifiers="alienblood" spawnposition="ThisInventory" MinAmount="4" />
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -231,7 +231,7 @@
     <Description tag="talentdescription.blooddonor" />
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
       <Abilities>
-        <CharacterAbilityPutItem itemidentifier="antibloodloss2" amount="1"/>
+        <CharacterAbilityPutItem itemidentifier="antibloodloss2" amount="2"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -239,7 +239,7 @@
   <Talent identifier="stayinalive">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.slightlypowerfulcpr">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Abilities>
@@ -257,11 +257,11 @@
   <Talent identifier="selfcare">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.medicaleffectiveness">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.2" />
+        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.6" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -269,17 +269,17 @@
   <Talent identifier="laresistance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.opiateaddiction" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.chemaddiction" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="0.5"/>
-        <CharacterAbilityGiveResistance resistanceid="chemaddiction" multiplier="0.5"/>
+        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="1"/>
+        <CharacterAbilityGiveResistance resistanceid="chemaddiction" multiplier="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -287,12 +287,12 @@
   <Talent identifier="exampleofhealth">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maximumhealthmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.2"/>
+        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -300,8 +300,8 @@
   <Talent identifier="nobodyimportantdies">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.nobodyimportantdies">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
-      <Replace tag="[penalty]" value="20" color="gui.red"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[penalty]" value="10" color="gui.red"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnReduceAffliction">
       <Conditions>
@@ -310,10 +310,10 @@
         </AbilityConditionCharacter>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="0.8"/>
+        <CharacterAbilityModifyValue multiplyvalue="0.9"/>
       </Abilities>
       <FallbackAbilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.1"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
       </FallbackAbilities>
     </AbilityGroupEffect>
   </Talent>
@@ -321,21 +321,21 @@
   <Talent identifier="healthinsurance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="4,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.healthinsurance">
-      <Replace tag="[amount]" value="30" color="gui.orange"/>
-      <Replace tag="[money]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.orange"/>
+      <Replace tag="[money]" value="400" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.medicalitemscostless">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="StoreBuyMultiplier" value="0.1" setvalue="true" />
+        <CharacterAbilityGivePermanentStat statidentifier="medical" stattype="StoreBuyMultiplier" value="0.2" setvalue="true" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="1">
       <Conditions>
         <AbilityConditionHasPermanentStat statidentifier="healthinsurance" min="1" invert="true"/>
-        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.3"/>
+        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.6"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityGivePermanentStat statidentifier="healthinsurance" value="1" setvalue="true" />
@@ -373,14 +373,14 @@
   <Talent identifier="supersoldiers">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.increaseappliedbuffduration">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.combatstimulantsyringe" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="BuffItemApplyingMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="combatstimulantsyringe"/>
@@ -389,14 +389,14 @@
   <Talent identifier="whatastench">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.acidsdealmoredamage">
-      <Replace tag="[amount]" value="15" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.chemgrenade,entityname.40mmchemgrenade" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="acidburn" addedmultiplier="0.15" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="acidburn" addedmultiplier="0.3" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="chemgrenade"/>
@@ -406,7 +406,7 @@
   <Talent identifier="vitaminsupplements">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.vitaminsupplements">
-      <Replace tag="[healthboost]" value="20" color="gui.green"/>
+      <Replace tag="[healthboost]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnApplyTreatment">
       <Conditions>
@@ -431,11 +431,11 @@
   <Talent identifier="genesplicer">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.geneticmaterialrefineflatbonus">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="GeneticMaterialRefineBonus" value="10"/>
+        <CharacterAbilityGiveStat stattype="GeneticMaterialRefineBonus" value="20"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -443,11 +443,11 @@
   <Talent identifier="drsubmarine">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.gainmedicalitemeffectiveness">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalItemApplyingMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="MedicalItemApplyingMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -479,7 +479,7 @@
   <Talent identifier="geneharvester">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.geneharvester">
-      <Replace tag="[probability]" value="20" color="gui.green"/>
+      <Replace tag="[probability]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnRoundEnd">
       <Abilities>
@@ -494,7 +494,7 @@
           <Conditional ispet="false" />
         </AbilityConditionCharacter>
         <AbilityConditionCharacterNotLooted identifier="geneharvester"/>
-        <AbilityConditionServerRandom randomchance="0.2" />
+        <AbilityConditionServerRandom randomchance="0.6" />
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -520,7 +520,7 @@
   <Talent identifier="plaguedoctor">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.acidburn" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -530,7 +530,7 @@
     <AddedRecipe itemidentifier="sulphuricacidsyringe"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveResistance resistanceid="acidburn" multiplier="0.5"/>
+        <CharacterAbilityGiveResistance resistanceid="acidburn" multiplier="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
diff --git a/Content/Talents/Engineer/AfflictionsEngineer.xml b/Content/Talents/Engineer/AfflictionsEngineer.xml
index 9ba32568..f9cb9472 100644
--- a/Content/Talents/Engineer/AfflictionsEngineer.xml
+++ b/Content/Talents/Engineer/AfflictionsEngineer.xml
@@ -25,11 +25,11 @@
     hideiconafterdelay="true"
     limbspecific="false"
     maxstrength="60"
-    duration="60"
+    duration="90"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="60" strengthchange="-1">
-      <StatValue stattype="RepairSpeed" value="0.25" />
+      <StatValue stattype="RepairSpeed" value="0.5" />
       <StatusEffect target="Character">
         <TriggerAnimation Type="Walk" filename="JollyWalk" priority="3" ExpectedSpecies="Human" />
       </StatusEffect>
@@ -81,8 +81,8 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="RepairSpeed" value="0.5" />
-      <StatValue stattype="RepairToolStructureRepairMultiplier" value="0.5" />
+      <StatValue stattype="RepairSpeed" value="1" />
+      <StatValue stattype="RepairToolStructureRepairMultiplier" value="1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="2,3" sheetelementsize="128,128"/>
   </Affliction>
diff --git a/Content/Talents/Engineer/TalentsEngineer.xml b/Content/Talents/Engineer/TalentsEngineer.xml
index 14736776..7f42fb51 100644
--- a/Content/Talents/Engineer/TalentsEngineer.xml
+++ b/Content/Talents/Engineer/TalentsEngineer.xml
@@ -3,14 +3,14 @@
   <Talent identifier="betterthannew">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="5,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.betterthannew">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnRepairComplete">
       <Conditions>
         <AbilityConditionItem tags="junctionbox,supercapacitor,battery,reactor,sonarmonitor,statusmonitor,navterminal"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStat stattype="DetoriationSpeed" value="0.7"/>
+        <CharacterAbilityGiveItemStat stattype="DetoriationSpeed" value="0.4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -18,16 +18,16 @@
   <Talent identifier="buzzing">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.buzzing">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.2" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorMaxOutput" value="1.2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -35,16 +35,16 @@
   <Talent identifier="cruising">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.cruising">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.8" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.6" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.8" />
+        <CharacterAbilityGiveItemStatToTags tags="reactor" stattype="ReactorFuelConsumption" value="0.6" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -52,10 +52,10 @@
   <Talent identifier="unstoppablecuriosity">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.gainforcedoorsopenspeed">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.phdinnuclearphysics">
-      <Replace tag="[powerincrease]" value="100" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
       <Conditions>
@@ -63,7 +63,7 @@
         <AbilityConditionAttackData tags="crowbaritem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="1"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnItemPicked">
@@ -71,7 +71,7 @@
         <AbilityConditionItem tags="door,aliendoor" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="0.5" />
+        <CharacterAbilityModifyValue multiplyvalue="1" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -79,19 +79,19 @@
   <Talent identifier="pyromaniac">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.pyromaniac">
-      <Replace tag="[burnincrease]" value="25" color="gui.green"/>
+      <Replace tag="[burnincrease]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.flamer" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="burn" addedmultiplier="0.25" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="burn" addedmultiplier="0.5" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BallastFloraDamageMultiplier" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="BallastFloraDamageMultiplier" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="flamer"/>
@@ -100,11 +100,11 @@
   <Talent identifier="weaponartisan">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="0,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualityweapons">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -114,7 +114,7 @@
     <Description tag="talentdescription.electrochemist">
       <Replace tag="[seconds]" value="10" color="gui.green"/>
       <Replace tag="[powerreduction]" value="80" color="gui.green"/>
-      <Replace tag="[stunseconds]" value="4" color="gui.green"/>
+      <Replace tag="[stunseconds]" value="8" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.arcemitter" color="gui.orange"/>
@@ -140,7 +140,7 @@
         <CharacterAbilityApplyStatusEffectsToAttacker>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" targetlimb="Torso" delay="0.1" disabledeltatime="true">
-              <Affliction identifier="stun" amount="4.0"/>
+              <Affliction identifier="stun" amount="8"/>
               <Affliction identifier="electricshock" strength="60"/>
               <ParticleEmitter particle="ElectricShock" distancemin="0" distancemax="50" particleamount="5" anglemin="0" anglemax="360" scalemin="0.1" scalemax="0.2" />
               <sound file="Content/Items/Weapons/WEAPONS_electricalDischarge1.ogg" range="500" />
@@ -174,9 +174,9 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.melodicrespite2">
       <Replace tag="[duration]" value="10" color="gui.green"/>
-      <Replace tag="[buffamount]" value="25" color="gui.green"/>
+      <Replace tag="[buffamount]" value="50" color="gui.green"/>
       <Replace tag="[buffname]" value="stattypenames.repairspeed" color="gui.orange"/>
-      <Replace tag="[buffduration]" value="60" color="gui.green"/>
+      <Replace tag="[buffduration]" value="90" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnUseRangedWeapon">
       <Conditions>
@@ -198,10 +198,10 @@
         <AbilityConditionHasAffliction afflictionidentifier="melodicrespite_charging" minimumpercentage="0.9"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityApplyStatusEffectsToAllies range="600">
+        <CharacterAbilityApplyStatusEffectsToAllies range="1200">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" multiplyafflictionsbymaxvitality="false" interval="1" disabledeltatime="true">
-              <Affliction identifier="melodicrespite" amount="60"/>
+              <Affliction identifier="melodicrespite" amount="90"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffectsToAllies>
@@ -226,7 +226,7 @@
         <AbilityConditionAttackData tags="screwdriveritem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="2"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -234,11 +234,11 @@
   <Talent identifier="funwithfission">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualityfuelrods">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="reactorfuel" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="reactorfuel" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -246,17 +246,17 @@
   <Talent identifier="grounded">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.electrical" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.burn" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="10"/>
-        <CharacterAbilityGiveResistance resistanceid="burn" multiplier="0.8"/>
+        <CharacterAbilityGiveStat stattype="ElectricalSkillBonus" value="20"/>
+        <CharacterAbilityGiveResistance resistanceid="burn" multiplier="0.6"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -264,12 +264,12 @@
   <Talent identifier="egghead">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="3200" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.skillgainspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="1.0"/>
+        <CharacterAbilityModifyStat stattype="SkillGainSpeed" value="32"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -282,17 +282,17 @@
     </Description>
     <Description tag="talentdescription.junctionjunkie.30">
       <Replace tag="[requirement]" value="30" color="gui.green"/>
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.electricalskillbonus" color="gui.orange"/>
-      <Replace tag="[xpamount]" value="500" color="gui.green"/>
+      <Replace tag="[xpamount]" value="2000" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.junctionjunkie.50">
       <Replace tag="[requirement]" value="50" color="gui.green"/>
-      <Replace tag="[level]" value="1" color="gui.green"/>
+      <Replace tag="[level]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.junctionjunkie.100">
       <Replace tag="[requirement]" value="100" color="gui.green"/>
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
 
     <!-- Give the player stats that tracks if the rewards should be given -->
@@ -319,8 +319,8 @@
         <AbilityConditionHasPermanentStat statidentifier="junctionjunkie_counter" min="30"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="500"/>
-        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="junctionjunkie" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="2000"/>
+        <CharacterAbilityGivePermanentStat stattype="ElectricalSkillBonus" statidentifier="junctionjunkie" value="20" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="junctionjunkie_30" />
       </Abilities>
     </AbilityGroupEffect>
@@ -331,7 +331,7 @@
         <AbilityConditionHasPermanentStat statidentifier="junctionjunkie_counter" min="50"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="increaseovervoltageresistance" upgradecategory="junctionboxes" level="1" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="increaseovervoltageresistance" upgradecategory="junctionboxes" level="2" />
         <CharacterAbilityResetPermanentStat statidentifier="junctionjunkie_50" />
       </Abilities>
     </AbilityGroupEffect>
@@ -342,7 +342,7 @@
         <AbilityConditionHasPermanentStat statidentifier="junctionjunkie_counter" min="100"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="ElectricalRepairSpeed" statidentifier="junctionjunkie" value="0.5" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGivePermanentStat stattype="ElectricalRepairSpeed" statidentifier="junctionjunkie" value="1" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="junctionjunkie_100" />
       </Abilities>
     </AbilityGroupEffect>
@@ -351,12 +351,12 @@
   <Talent identifier="stationengineer">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="7,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.stationengineer">
-      <Replace tag="[bonus]" value="30" color="gui.green"/>
+      <Replace tag="[bonus]" value="120" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.stationengineerbuff">
-      <Replace tag="[amount1]" value="50" color="gui.green"/>
+      <Replace tag="[amount1]" value="100" color="gui.green"/>
       <Replace tag="[skill1]" value="stattypenames.repairspeed" color="gui.orange"/>
-      <Replace tag="[amount2]" value="50" color="gui.green"/>
+      <Replace tag="[amount2]" value="100" color="gui.green"/>
       <Replace tag="[skill2]" value="stattypenames.repairtoolstructurerepairmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -364,7 +364,7 @@
         <AbilityConditionMission missiontype="Beacon"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
+        <CharacterAbilityModifyValue multiplyvalue="1.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="0.9">
@@ -386,7 +386,7 @@
   <Talent identifier="militaryapplications">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.weapons" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -394,7 +394,7 @@
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="40"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="depletedfuel"/>
@@ -439,12 +439,12 @@
       <Replace tag="[itemname]" value="entityname.handheldelectricalmonitor" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityModifyStat stattype="RepairSpeed" value="0.5"/>
+        <CharacterAbilityModifyStat stattype="RepairSpeed" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="handheldelectricalmonitor"/>
@@ -453,7 +453,7 @@
   <Talent identifier="phdinnuclearphysics">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.phdinnuclearphysics">
-      <Replace tag="[powerincrease]" value="200" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="400" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstackwith">
       <Replace tag="[talentname]" value="talentname.unstoppablecuriosity" color="gui.orange"/>
@@ -466,7 +466,7 @@
         <AbilityConditionAttackData tags="crowbaritem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="2"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="4"/>
       </Abilities>
     </AbilityGroupEffect>
     <!--<AbilityGroupInterval interval="0.5" >
@@ -483,24 +483,24 @@
   <Talent identifier="unlimitedpower">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,0" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualitybatteries">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlimitedpower">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="mobilebattery" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="mobilebattery" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.2" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="supercapacitor,battery" stattype="BatteryCapacity" value="1.2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
diff --git a/Content/Talents/Mechanic/AfflictionsMechanic.xml b/Content/Talents/Mechanic/AfflictionsMechanic.xml
index a2fe74cc..f6506c80 100644
--- a/Content/Talents/Mechanic/AfflictionsMechanic.xml
+++ b/Content/Talents/Mechanic/AfflictionsMechanic.xml
@@ -29,7 +29,7 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1">
-      <StatValue stattype="MeleeAttackMultiplier" value="0.2" />
+      <StatValue stattype="MeleeAttackMultiplier" value="0.3" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="7,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -46,9 +46,9 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="1" 
             resistancefor="damage"
-            minresistance="0.1"
-            maxresistance="0.1">
-      <StatValue stattype="SwimmingSpeed" value="0.5" />
+            minresistance="0.15"
+            maxresistance="0.15">
+      <StatValue stattype="SwimmingSpeed" value="1" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="7,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
@@ -94,7 +94,7 @@
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="10" strengthchange="-1">
-      <StatValue stattype="MovementSpeed" value="0.20" />
+      <StatValue stattype="MovementSpeed" value="0.3" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons4.png" sheetindex="1,1" sheetelementsize="128,128"/>
   </Affliction>
diff --git a/Content/Talents/Mechanic/TalentsMechanic.xml b/Content/Talents/Mechanic/TalentsMechanic.xml
index 89977b7f..783672e8 100644
--- a/Content/Talents/Mechanic/TalentsMechanic.xml
+++ b/Content/Talents/Mechanic/TalentsMechanic.xml
@@ -22,15 +22,15 @@
   <Talent identifier="foolhardy">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="4,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.lowhealthstatboost">
-      <Replace tag="[health]" value="50" color="gui.green"/>
+      <Replace tag="[health]" value="68.5" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
-        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.5"/>
+        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.69"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -47,15 +47,15 @@
   <Talent identifier="berserker">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.lowhealthstatboost">
-      <Replace tag="[health]" value="50" color="gui.green"/>
+      <Replace tag="[health]" value="68.5" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.meleedamagebonus" color="gui.orange"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
-        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.5"/>
+        <AbilityConditionAboveVitality invert="true" vitalitypercentage="0.69"/>
       </Conditions>
       <Abilities>
         <CharacterAbilityApplyStatusEffects>
@@ -72,10 +72,10 @@
   <Talent identifier="mudraptorwrestler">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.mudraptorwrestler">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="75" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="15" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.physicalresistance" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -86,12 +86,12 @@
         </AbilityConditionCharacter>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.75"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveResistance resistanceid="damage" multiplier="0.9"/>
+        <CharacterAbilityGiveResistance resistanceid="damage" multiplier="0.85"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -99,14 +99,14 @@
   <Talent identifier="heavylifting">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.heavylifting">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
         <AbilityConditionHoldingItem tags="alienartifact,crate"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.2"/>
+        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.3"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -114,10 +114,10 @@
   <Talent identifier="iamthatguy">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.iamthatguy">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[skillname]" value="stattypenames.weaponsskillbonus" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
@@ -125,12 +125,12 @@
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="20"/>
+        <CharacterAbilityGiveStat stattype="WeaponsSkillBonus" value="30"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="blunttrauma" addedmultiplier="0.2" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="blunttrauma" addedmultiplier="0.3" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="heavywrench"/>
@@ -140,7 +140,7 @@
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="3,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.robotics"/>
     <Description tag="talentdescription.roboticsreminder">
-      <Replace tag="[amount]" value="2" color="gui.green"/>
+      <Replace tag="[amount]" value="4" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.defensebotspawner,entityname.defensebotammobox" color="gui.orange"/>
@@ -168,11 +168,11 @@
   <Talent identifier="residualwaste">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.residualwaste">
-      <Replace tag="[chance]" value="20" color="gui.green"/>
+      <Replace tag="[chance]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnItemDeconstructedMaterial">
       <Conditions>
-        <AbilityConditionServerRandom randomChance="0.2"/>
+        <AbilityConditionServerRandom randomChance="1"/>
         <!-- don't allow duplicating genetic materials, and prevent infinite FPGA circuits -->
         <AbilityConditionItem tags="geneticmaterial,unidentifiedgeneticmaterial,circuitboxcomponent,lightcomponent" invert="true"/>
       </Conditions>
@@ -185,11 +185,11 @@
   <Talent identifier="massproduction">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.massproduction">
-      <Replace tag="[chance]" value="40" color="gui.green"/>
+      <Replace tag="[chance]" value="58" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnItemFabricatedIngredients">
       <Conditions>
-        <AbilityConditionServerRandom randomChance="0.4" />
+        <AbilityConditionServerRandom randomChance="0.58" />
       </Conditions>
       <Abilities>
         <CharacterAbilityRemoveRandomIngredient>
@@ -202,18 +202,18 @@
   <Talent identifier="toolmaintenance">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="5,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.toolmaintenance">
-      <Replace tag="[amount]" value="1" color="gui.green"/>
+      <Replace tag="[amount]" value="2" color="gui.green"/>
     </Description>
     <!-- Give once when unlocking the talent -->
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="1" targetallies="true" setvalue="true"/>
+        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="2" targetallies="true" setvalue="true"/>
       </Abilities>
     </AbilityGroupEffect>
     <!-- Give every 60 seconds for late comers -->
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="1" targetallies="true" setvalue="true"/>
+        <CharacterAbilityGivePermanentStat statidentifier="tool~toolmaintenance" stattype="IncreaseFabricationQuality" value="2" targetallies="true" setvalue="true"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -221,19 +221,19 @@
   <Talent identifier="miner">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.miner">
-      <Replace tag="[probability]" value="20" color="gui.green"/>
+      <Replace tag="[probability]" value="70" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.gainoredetachspeed">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="RepairToolDeattachTimeMultiplier" value="1"/>
+        <CharacterAbilityGiveStat stattype="RepairToolDeattachTimeMultiplier" value="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnItemDeconstructedMaterial">
       <Conditions>
-        <AbilityConditionServerRandom randomchance="0.2"/>
+        <AbilityConditionServerRandom randomchance="0.7"/>
         <AbilityConditionItem tags="ore"/>
       </Conditions>
       <Abilities>
@@ -265,13 +265,13 @@
   <Talent identifier="oiledmachinery">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="4,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.oiledmachinery">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="800" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
     <AbilityGroupInterval interval="60">
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="fabricator" stattype="FabricationSpeed" value="1.5" />
-        <CharacterAbilityGiveItemStatToTags tags="deconstructor" stattype="DeconstructorSpeed" value="1.5" />
+        <CharacterAbilityGiveItemStatToTags tags="fabricator" stattype="FabricationSpeed" value="8" />
+        <CharacterAbilityGiveItemStatToTags tags="deconstructor" stattype="DeconstructorSpeed" value="8" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupEffect abilityeffecttype="None">
@@ -285,7 +285,7 @@
   <Talent identifier="pumpndump">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.pumpndump">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maxflow" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnRepairComplete">
@@ -293,7 +293,7 @@
         <AbilityConditionItem tags="pump"/>
       </conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStat stattype="PumpSpeed" value="1.1"/>
+        <CharacterAbilityGiveItemStat stattype="PumpSpeed" value="1.3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -301,11 +301,11 @@
   <Talent identifier="ballastdenizen">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,6" sheetelementsize="128,128"/>
     <Description tag="talentdescription.ballastdenizen">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="HoldBreathMultiplier" value="0.5"/>
+        <CharacterAbilityGiveStat stattype="HoldBreathMultiplier" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -313,8 +313,8 @@
   <Talent identifier="engineengineer">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,5" sheetelementsize="128,128"/>
     <Description tag="talentdescription.engineengineer">
-      <Replace tag="[amount]" value="2.5" color="gui.green"/>
-      <Replace tag="[max]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="5" color="gui.green"/>
+      <Replace tag="[max]" value="40" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maxspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.doesnotstack" />
@@ -323,7 +323,7 @@
         <AbilityConditionHasLevel levelequals="1" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.025" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.05" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -331,7 +331,7 @@
         <AbilityConditionHasLevel levelequals="2" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.05" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.1" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -339,7 +339,7 @@
         <AbilityConditionHasLevel levelequals="3" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.075" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.15" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -347,7 +347,7 @@
         <AbilityConditionHasLevel levelequals="4" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.1" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.2" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -355,7 +355,7 @@
         <AbilityConditionHasLevel levelequals="5" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.125" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.25" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -363,7 +363,7 @@
         <AbilityConditionHasLevel levelequals="6" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.15" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.3" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -371,7 +371,7 @@
         <AbilityConditionHasLevel levelequals="7" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.175" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.35" />
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="60">
@@ -379,7 +379,7 @@
         <AbilityConditionHasLevel minlevel="8" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.2" />
+        <CharacterAbilityGiveItemStatToTags tags="engine" stattype="EngineMaxSpeed" stackable="false" value="1.4" />
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -387,14 +387,14 @@
   <Talent identifier="multifunctional">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.multifunctional">
-      <Replace tag="[powerincrease]" value="50" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="75" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
       <Conditions>
         <AbilityConditionAttackData tags="wrenchitem"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.75"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -410,19 +410,19 @@
   <Talent identifier="salvagecrew">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,7" sheetelementsize="128,128"/>
     <Description tag="talentdescription.bonusxponmission">
-      <Replace tag="[xpbonus]" value="30" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="120" color="gui.green"/>
       <Replace tag="[missiontype]" value="missiontype.salvage" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.salvagecrew">
-      <Replace tag="[swimbonus]" value="50" color="gui.green"/>
-      <Replace tag="[resistanceamount]" value="10" color="gui.green"/>
+      <Replace tag="[swimbonus]" value="100" color="gui.green"/>
+      <Replace tag="[resistanceamount]" value="15" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
       <Conditions>
         <AbilityConditionMission missiontype="Salvage"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
+        <CharacterAbilityModifyValue multiplyvalue="2.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval interval="0.9">
@@ -449,17 +449,17 @@
     </Description>
     <Description tag="talentdescription.machinemaniac.30">
       <Replace tag="[requirement]" value="12" color="gui.green"/>
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="15" color="gui.green"/>
       <Replace tag="[skill]" value="stattypenames.mechanicalskillbonus" color="gui.orange"/>
-      <Replace tag="[xpamount]" value="500" color="gui.green"/>
+      <Replace tag="[xpamount]" value="2000" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.machinemaniac.50">
       <Replace tag="[requirement]" value="20" color="gui.green"/>
-      <Replace tag="[level]" value="1" color="gui.green"/>
+      <Replace tag="[level]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.machinemaniac.100">
       <Replace tag="[requirement]" value="40" color="gui.green"/>
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
     </Description>
 
     <!-- Give the player stats that tracks if the rewards should be given -->
@@ -486,8 +486,8 @@
         <AbilityConditionHasPermanentStat statidentifier="machinemaniac_counter" min="12"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGiveExperience amount="500"/>
-        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="machinemaniac" value="10" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGiveExperience amount="2000"/>
+        <CharacterAbilityGivePermanentStat stattype="MechanicalSkillBonus" statidentifier="machinemaniac" value="15" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="machinemaniac_30" />
       </Abilities>
     </AbilityGroupEffect>
@@ -498,7 +498,7 @@
         <AbilityConditionHasPermanentStat statidentifier="machinemaniac_counter" min="20"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="increasemaxpumpflow" upgradecategory="pumps" level="1" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="increasemaxpumpflow" upgradecategory="pumps" level="2" />
         <CharacterAbilityResetPermanentStat statidentifier="machinemaniac_50" />
       </Abilities>
     </AbilityGroupEffect>
@@ -509,7 +509,7 @@
         <AbilityConditionHasPermanentStat statidentifier="machinemaniac_counter" min="40"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="MechanicalRepairSpeed" statidentifier="machinemaniac" value="0.5" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGivePermanentStat stattype="MechanicalRepairSpeed" statidentifier="machinemaniac" value="1" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="machinemaniac_100" />
       </Abilities>
     </AbilityGroupEffect>
@@ -518,11 +518,11 @@
   <Talent identifier="tinkerer">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,1" sheetelementsize="128,128"/>
     <Description tag="talentdescription.increasemaxrepairmechanical">
-      <Replace tag="[percentage]" value="40" color="gui.green"/>
+      <Replace tag="[percentage]" value="100" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MaxRepairConditionMultiplierMechanical" value="0.4"/>
+        <CharacterAbilityGiveStat stattype="MaxRepairConditionMultiplierMechanical" value="1"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -533,14 +533,14 @@
       <Replace tag="[itemname]" value="entityname.repairpack" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.freeupgrade">
-      <Replace tag="[level]" value="1" color="gui.green"/>
+      <Replace tag="[level]" value="2" color="gui.green"/>
       <Replace tag="[upgradename]" value="upgradename.decreaselowskillfixduration" color="gui.orange"/>
     </Description>
     <AddedRecipe itemidentifier="repairpack"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="electricaldevices" level="1" />
-        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="mechanicaldevices" level="1" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="electricaldevices" level="2" />
+        <CharacterAbilityUpgradeSubmarine upgradeprefab="decreaselowskillfixduration" upgradecategory="mechanicaldevices" level="2" />
       </Abilities>
     </AbilityGroupEffect>
 
@@ -552,12 +552,12 @@
       <Replace tag="[itemname]" value="entityname.fixfoamgrenade,entityname.handheldstatusmonitor" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattype">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.repairtoolstructurerepairmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="RepairToolStructureRepairMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="RepairToolStructureRepairMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="fixfoamgrenade"/>
@@ -568,14 +568,14 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="1,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.letitdrain"/>
     <Description tag="talentdescription.letitdrainreminder">
-      <Replace tag="[itemcount]" value="2" color="gui.green"/>
+      <Replace tag="[itemcount]" value="8" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.portablepump" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="portablepump" stattype="MaxAttachableCount" value="2" />
+        <CharacterAbilityGivePermanentStat statidentifier="portablepump" stattype="MaxAttachableCount" value="8" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="portablepump"/>
@@ -584,13 +584,13 @@
   <Talent identifier="quickfixer">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="5,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.quickfixer">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
-      <Replace tag="[duration]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[duration]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.repairmechanicaldevicestwiceasfast"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MechanicalRepairSpeed" value="1"/>
+        <CharacterAbilityGiveStat stattype="MechanicalRepairSpeed" value="2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnRepairComplete">
@@ -601,7 +601,7 @@
         <CharacterAbilityApplyStatusEffects>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="Character" disabledeltatime="true">
-              <Affliction identifier="quickfixer" amount="10.0"/>
+              <Affliction identifier="quickfixer" amount="20"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -613,14 +613,14 @@
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="6,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.doublescrapoutput" />
     <Description tag="talentdescription.findadditionalscrap">
-      <Replace tag="[probability]" value="20" color="gui.green"/>
+      <Replace tag="[probability]" value="69" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnItemDeconstructedMaterial">
       <Conditions>
         <AbilityConditionItem tags="scrap"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="2"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnOpenItemContainer">
@@ -629,7 +629,7 @@
         <AbilityConditionItem tags="container"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilitySpawnItemsToContainer randomchance="0.2" oncepercontainer="true">
+        <CharacterAbilitySpawnItemsToContainer randomchance="0.69" oncepercontainer="true">
           <StatusEffects>
             <StatusEffect type="OnAbility" target="UseTarget" >
               <SpawnItem identifiers="scrap" spawnposition="ThisInventory" spawnifcantbecontained="false" />
diff --git a/Content/Talents/Security/AfflictionsSecurity.xml b/Content/Talents/Security/AfflictionsSecurity.xml
index cb54dbe5..cf709a1a 100644
--- a/Content/Talents/Security/AfflictionsSecurity.xml
+++ b/Content/Talents/Security/AfflictionsSecurity.xml
@@ -55,14 +55,14 @@
     isbuff="true"
     hideiconafterdelay="true"
     limbspecific="false"
-    maxstrength="4"
+    maxstrength="8"
     treatmentthreshold="1000"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
-    <Effect minstrength="0" maxstrength="4"
+    <Effect minstrength="0" maxstrength="8"
       strengthchange="-1"
       resistancefor="damage,stun"
-      minresistance="0.25"
-      maxresistance="0.25"/>
+      minresistance="0.5"
+      maxresistance="0.5"/>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="1,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
   
@@ -74,10 +74,10 @@
     limbspecific="false"
     maxstrength="15"
     treatmentthreshold="1000"
-    duration="15"
+    duration="30"
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="15">
-      <StatValue stattype="AttackMultiplier" value="0.25" />
+      <StatValue stattype="AttackMultiplier" value="0.5" />
       <AbilityFlag flagtype="AlwaysStayConscious" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
@@ -93,7 +93,7 @@
     iconcolors="33,75,78;126,211,224;126,211,224;227,247,249">
     <Effect minstrength="0" maxstrength="2"
       strengthchange="-1">
-      <StatValue stattype="AttackMultiplier" value="0.20" />
+      <StatValue stattype="AttackMultiplier" value="0.4" />
     </Effect>
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,0" sheetelementsize="128,128" color="10,193,114,255" origin="0,0"/>
   </Affliction>
diff --git a/Content/Talents/Security/TalentsSecurity.xml b/Content/Talents/Security/TalentsSecurity.xml
index b536cec6..f9c05ea6 100644
--- a/Content/Talents/Security/TalentsSecurity.xml
+++ b/Content/Talents/Security/TalentsSecurity.xml
@@ -3,17 +3,17 @@
   <Talent identifier="gunrunner">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="0,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.gunrunner">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.walkfasterwhileaiming">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval interval="0.9">
       <Conditions>
         <AbilityConditionIsAiming weapontype="ranged"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.2"/>
+        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.4"/>
       </Abilities>
     </AbilityGroupInterval>
     <AbilityGroupInterval interval="0.9">
@@ -21,7 +21,7 @@
         <AbilityConditionHoldingItem tags="ammobox,railgunammo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.25"/>
+        <CharacterAbilityModifyStat stattype="MovementSpeed" value="0.5"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -29,17 +29,17 @@
   <Talent identifier="extrapowder">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="3,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.extrapowder">
-      <Replace tag="[rangeamount]" value="20" color="gui.green"/>
-      <Replace tag="[damageamount]" value="10" color="gui.green"/>
+      <Replace tag="[rangeamount]" value="60" color="gui.green"/>
+      <Replace tag="[damageamount]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.crafthighqualityexplosives">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="ExplosionRadiusMultiplier" value="0.2"/>
-        <CharacterAbilityGiveStat stattype="ExplosionDamageMultiplier" value="0.1"/>
-        <CharacterAbilityGivePermanentStat statidentifier="demolitionsexpert" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGiveStat stattype="ExplosionRadiusMultiplier" value="0.6"/>
+        <CharacterAbilityGiveStat stattype="ExplosionDamageMultiplier" value="0.2"/>
+        <CharacterAbilityGivePermanentStat statidentifier="demolitionsexpert" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -47,7 +47,7 @@
   <Talent identifier="rifleman">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="7,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.moredamagerifles">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.assaultrifle,entityname.assaultriflemagazine,entityname.rifle,entityname.riflebullet" color="gui.orange"/>
@@ -57,7 +57,7 @@
         <AbilityConditionAttackData tags="riflemanbonus"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.10"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="assaultrifle"/>
@@ -79,11 +79,11 @@
   <Talent identifier="inordinateexsanguination">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.extrableedingdamage">
-      <Replace tag="[amount]" value="100" color="gui.green"/>
+      <Replace tag="[amount]" value="200" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAddDamageAffliction">
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="bleeding" addedmultiplier="1.0" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="bleeding" addedmultiplier="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -113,7 +113,7 @@
         </AbilityConditionCharacter>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="1" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="2" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -121,14 +121,14 @@
   <Talent identifier="easyturtle">
     <Icon texture="Content/UI/TalentsIcons2.png" sheetindex="4,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.easyturtle">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <AbilityGroupInterval>
       <Conditions>
         <AbilityConditionInWater/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyResistance resistanceid="damage" multiplier="0.8"/>
+        <CharacterAbilityModifyResistance resistanceid="damage" multiplier="0.6"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
@@ -136,12 +136,12 @@
   <Talent identifier="daringdolphin">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="5,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.swimmingspeed" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="SwimmingSpeed" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="SwimmingSpeed" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -159,17 +159,17 @@
   <Talent identifier="buff">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,4" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="100" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.buffdurationmultiplier" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.opiateaddiction" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="BuffDurationMultiplier" value="0.5"/>
-        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="0.75"/>
+        <CharacterAbilityGiveStat stattype="BuffDurationMultiplier" value="100"/>
+        <CharacterAbilityGiveResistance resistanceid="opiateaddiction" multiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -186,14 +186,14 @@
   <Talent identifier="weaponsmith">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.crafthighqualityweapons">
-      <Replace tag="[qualitybonus]" value="1" color="gui.green"/>
+      <Replace tag="[qualitybonus]" value="2" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.shotgun,entityname.smg" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="1" />
+        <CharacterAbilityGivePermanentStat statidentifier="weapon" stattype="IncreaseFabricationQuality" value="2" />
       </Abilities>
     </AbilityGroupEffect>
     <AddedRecipe itemidentifier="shotgun"/>
@@ -258,17 +258,17 @@
   <Talent identifier="swole">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="6,2" sheetelementsize="128,128"/>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.maximumhealthmultiplier" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.meleeattackmultiplier" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.1"/>
-        <CharacterAbilityGiveStat stattype="MeleeAttackMultiplier" value="0.25"/>
+        <CharacterAbilityGiveStat stattype="MaximumHealthMultiplier" value="0.2"/>
+        <CharacterAbilityGiveStat stattype="MeleeAttackMultiplier" value="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
@@ -276,8 +276,8 @@
   <Talent identifier="protectandserve">
     <Icon texture="Content/UI/TalentsIcons3.png" sheetindex="6,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.protectandserve">
-      <Replace tag="[xpbonus]" value="30" color="gui.green"/>
-      <Replace tag="[repbonus]" value="100" color="gui.green"/>
+      <Replace tag="[xpbonus]" value="120" color="gui.green"/>
+      <Replace tag="[repbonus]" value="200" color="gui.green"/>
       <Replace tag="[missiontype]" value="missiontype.escort" color="gui.orange"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
@@ -285,7 +285,7 @@
         <AbilityConditionMission missiontype="Escort"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.3"/>
+        <CharacterAbilityModifyValue multiplyvalue="2.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnCrewGainMissionReputation">
@@ -294,49 +294,49 @@
       </Conditions>
       <Abilities>
         <!-- this modifies the reputation gain multiplier, adding 1 means 100% more rep -->
-        <CharacterAbilityModifyValue addedvalue="1"/>
+        <CharacterAbilityModifyValue addedvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
   
   <Talent identifier="firstaidtraining">
     <Description tag="talentdescription.skillbonus">
-      <Replace tag="[amount]" value="15" color="gui.green"/>
+      <Replace tag="[amount]" value="30" color="gui.green"/>
       <Replace tag="[skillname]" value="skillname.medical" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.medicaleffectiveness">
-      <Replace tag="[amount]" value="35" color="gui.green"/>
+      <Replace tag="[amount]" value="70" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="15"/>
-        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.35" />
+        <CharacterAbilityGiveStat stattype="MedicalSkillBonus" value="30"/>
+        <CharacterAbilityGiveStat stattype="MedicalItemEffectivenessMultiplier" value="0.7" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="physicalconditioning">
     <Description tag="talentdescription.additionalstattypeself">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
       <Replace tag="[stattype]" value="stattypenames.movementspeed" color="gui.orange"/>
     </Description>
     <Description tag="talentdescription.additionalresistanceself">
-      <Replace tag="[amount]" value="30" color="gui.green"/>
+      <Replace tag="[amount]" value="60" color="gui.green"/>
       <Replace tag="[affliction]" value="afflictionname.oxygenlow" color="gui.orange"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="None">
       <Abilities>
-        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.1"/>
-        <CharacterAbilityGiveResistance resistanceid="oxygenlow" multiplier="0.7"/>
+        <CharacterAbilityGiveStat stattype="MovementSpeed" value="0.2"/>
+        <CharacterAbilityGiveResistance resistanceid="oxygenlow" multiplier="0.4"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="scavenger">
     <Description tag="talentdescription.scavenger">
-      <Replace tag="[probability]" value="25" color="gui.green"/>
+      <Replace tag="[probability]" value="50" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnOpenItemContainer">
@@ -345,14 +345,14 @@
         <AbilityConditionItem tags="container"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityRegenerateLoot randomchance="0.25" randomChancePerItem="0.3" />
+        <CharacterAbilityRegenerateLoot randomchance="0.5" randomChancePerItem="0.6" />
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="beatcop">
     <Description tag="talentdescription.extrastunonenemies">
-      <Replace tag="[amount]" value="25" color="gui.green"/>
+      <Replace tag="[amount]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.beatcop"/>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,2" sheetelementsize="128,128"/>
@@ -361,10 +361,10 @@
         <AbilityConditionCharacter targettypes="Enemy,InFriendlySubmarine"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="0.5" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="1" />
       </Abilities>
       <FallbackAbilities>
-        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="0.25" />
+        <CharacterAbilityModifyAffliction afflictionidentifiers="stun,incrementalstun,progressivestun" addedmultiplier="0.5" />
       </FallbackAbilities>
     </AbilityGroupEffect>
   </Talent>
@@ -372,10 +372,10 @@
   <Talent identifier="bythebook">
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="1,3" sheetelementsize="128,128"/>
     <Description tag="talentdescription.bythebook">
-      <Replace tag="[moneyamount]" value="1250" color="gui.green"/>
-      <Replace tag="[experienceamount]" value="200" color="gui.green"/>
-      <Replace tag="[moneyamountmax]" value="2500" color="gui.green"/>
-      <Replace tag="[experienceamountmax]" value="400" color="gui.green"/>
+      <Replace tag="[moneyamount]" value="1875" color="gui.green"/>
+      <Replace tag="[experienceamount]" value="300" color="gui.green"/>
+      <Replace tag="[moneyamountmax]" value="15000" color="gui.green"/>
+      <Replace tag="[experienceamountmax]" value="2400" color="gui.green"/>
     </Description>
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
       <Abilities>
@@ -386,10 +386,10 @@
 
   <Talent identifier="slayer">
     <Description tag="talentdescription.extrapowertoharpoons">
-      <Replace tag="[value]" value="25" color="gui.green"/>
+      <Replace tag="[value]" value="50" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.extrapowertoharpoonsinopensea">
-      <Replace tag="[value]" value="50" color="gui.green"/>
+      <Replace tag="[value]" value="100" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="4,2" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -397,7 +397,7 @@
         <AbilityConditionAttackData tags="harpoonammo"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.25"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -406,15 +406,15 @@
         <AbilityConditionInHull invert="true" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.25"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.5"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="warlord">
     <Description tag="talentdescription.warlord">
-      <Replace tag="[amount]" value="10" color="gui.green"/>
-      <Replace tag="[maxamount]" value="50" color="gui.green"/>
+      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[maxamount]" value="100" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.unlockrecipe">
       <Replace tag="[itemname]" value="entityname.hmg,entityname.hmgmagazine" color="gui.orange"/>
@@ -428,7 +428,7 @@
         <AbilityConditionNearbyCharacterCount distance="500" targettypes="Enemy" count="1"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.1" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.2" />
       </Abilities>
     </AbilityGroupEffect>
 
@@ -438,7 +438,7 @@
         <AbilityConditionNearbyCharacterCount distance="500" targettypes="Enemy" count="2"/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.1" />
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="1" />
       </Abilities>
     </AbilityGroupEffect>
 
@@ -475,9 +475,9 @@
 
   <Talent identifier="bootcamp">
     <Description tag="talentdescription.bootcamp">
-      <Replace tag="[xpamount]" value="50" color="gui.green"/>
-      <Replace tag="[level]" value="5" color="gui.green"/>
-      <Replace tag="[skillamount]" value="15" color="gui.green"/>
+      <Replace tag="[xpamount]" value="200" color="gui.green"/>
+      <Replace tag="[level]" value="10" color="gui.green"/>
+      <Replace tag="[skillamount]" value="30" color="gui.green"/>
       <Replace tag="[skilltype]" value="stattypenames.weaponsskillbonus" color="gui.orange"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="3,3" sheetelementsize="128,128"/>
@@ -492,28 +492,28 @@
     <AbilityGroupEffect abilityeffecttype="OnAnyMissionCompleted">
       <Conditions>
         <AbilityConditionHasPermanentStat statidentifier="bootcamp_receivedweaponbonus" min="1"/>
-        <AbilityConditionHasLevel minlevel="5" />
+        <AbilityConditionHasLevel minlevel="10" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="bootcamp" value="15" setvalue="true" removeondeath="false" />
+        <CharacterAbilityGivePermanentStat stattype="WeaponsSkillBonus" statidentifier="bootcamp" value="30" setvalue="true" removeondeath="false" />
         <CharacterAbilityResetPermanentStat statidentifier="bootcamp_receivedweaponbonus" />
       </Abilities>
     </AbilityGroupEffect>
 
     <AbilityGroupEffect abilityeffecttype="OnGainMissionExperience">
       <Conditions>
-        <AbilityConditionHasLevel maxlevel="4" />
+        <AbilityConditionHasLevel maxlevel="9" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyValue multiplyvalue="1.5"/>
+        <CharacterAbilityModifyValue multiplyvalue="3"/>
       </Abilities>
     </AbilityGroupEffect>
   </Talent>
 
   <Talent identifier="implacable">
     <Description tag="talentdescription.cannotfallunconsciousforseconds">
-      <Replace tag="[powerincrease]" value="25" color="gui.green"/>
-      <Replace tag="[seconds]" value="15" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="50" color="gui.green"/>
+      <Replace tag="[seconds]" value="30" color="gui.green"/>
     </Description>
     <Description tag="talentdescription.maxtriggeruntildeath"/>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="2,3" sheetelementsize="128,128"/>
@@ -535,8 +535,8 @@
 
   <Talent identifier="commando">
     <Description tag="talentdescription.commando">
-      <Replace tag="[spreadreduction]" value="70" color="gui.green"/>
-      <Replace tag="[powerincrease]" value="10" color="gui.green"/>
+      <Replace tag="[spreadreduction]" value="140" color="gui.green"/>
+      <Replace tag="[powerincrease]" value="20" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,1" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAttack">
@@ -545,7 +545,7 @@
         <AbilityConditionAttackData weapontype="handheldranged" />
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.10"/>
+        <CharacterAbilityModifyAttackData addeddamagemultiplier="0.2"/>
       </Abilities>
     </AbilityGroupEffect>
     <AbilityGroupInterval>
@@ -553,16 +553,16 @@
         <AbilityConditionCrouched/>
       </Conditions>
       <Abilities>
-        <CharacterAbilityModifyStat stattype="RangedSpreadReduction" value="0.7"/>
+        <CharacterAbilityModifyStat stattype="RangedSpreadReduction" value="1.4"/>
       </Abilities>
     </AbilityGroupInterval>
   </Talent>
 
   <Talent identifier="stonewall">
     <Description tag="talentdescription.stonewall">
-      <Replace tag="[physicaldamagereduction]" value="25" color="gui.green"/>
-      <Replace tag="[stunresistance]" value="25" color="gui.green"/>
-      <Replace tag="[seconds]" value="4" color="gui.green"/>
+      <Replace tag="[physicaldamagereduction]" value="50" color="gui.green"/>
+      <Replace tag="[stunresistance]" value="50" color="gui.green"/>
+      <Replace tag="[seconds]" value="8" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="0,3" sheetelementsize="128,128"/>
     <AbilityGroupEffect abilityeffecttype="OnAttackedResult">
@@ -570,7 +570,7 @@
         <CharacterAbilityApplyStatusEffects>
           <StatusEffects>
             <StatusEffect type="OnAbility" target="This" multiplyafflictionsbymaxvitality="true">
-              <Affliction identifier="stonewall" amount="4.0"/>
+              <Affliction identifier="stonewall" amount="8"/>
             </StatusEffect>
           </StatusEffects>
         </CharacterAbilityApplyStatusEffects>
@@ -589,7 +589,7 @@
 
   <Talent identifier="tandemfire">
     <Description tag="talentdescription.tandemfire">
-      <Replace tag="[amount]" value="20" color="gui.green"/>
+      <Replace tag="[amount]" value="40" color="gui.green"/>
     </Description>
     <Icon texture="Content/UI/TalentsIcons1.png" sheetindex="7,3" sheetelementsize="128,128"/>
     <AbilityGroupInterval interval="0.1">
diff --git a/Content/Talents/TalentTrees.xml b/Content/Talents/TalentTrees.xml
index 24906d01..b94dd058 100644
--- a/Content/Talents/TalentTrees.xml
+++ b/Content/Talents/TalentTrees.xml
@@ -1,411 +1,2360 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TalentTrees>
-  <TalentTree jobidentifier="captain">
-    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="bountyhunter"/>
-        <TalentOption identifier="logisticsexpert"/>
-        <TalentOption identifier="prodigy"/>
-        <TalentOption identifier="inspirationalleader"/>
-        <TalentOption identifier="veteran"/>
-        <TalentOption identifier="travelingtradesman"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="emergencymaneuvers"/>
-        <TalentOption identifier="sailorwithnoname"/>
-        <TalentOption identifier="camaraderie"/>
-        <TalentOption identifier="downwiththeship"/>
-        <TalentOption identifier="gunsmith"/>
-        <TalentOption identifier="steadytune"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary" blocks="skipper,politician">
-      <TalentOptions>
-        <TalentOption identifier="quickdraw"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="lonewolf"/>
-        <TalentOption identifier="deputy"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="drunkensailor"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="bigguns"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="skipper" type="specialization" requires="captain_primary" blocks="gunslinger,politician">
-      <TalentOptions>
-        <TalentOption identifier="leadingbyexample"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="helmsman"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="inspiringpresence"/>
-        <TalentOption identifier="trickledown"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="family"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="politician" type="specialization" requires="captain_primary" blocks="gunslinger,skipper">
-      <TalentOptions>
-        <TalentOption identifier="commendations"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="yourreputation"/>
-        <TalentOption identifier="affiliation"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="campaigning"/>
-        <TalentOption identifier="networking"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="figurehead"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="securityofficer">
-    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="protectandserve"/>
-        <TalentOption identifier="warstories"/>
-        <TalentOption identifier="firstaidtraining"/>
-        <TalentOption identifier="physicalconditioning"/>
-        <TalentOption identifier="swole"/>
-        <TalentOption identifier="buff"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="weaponsmith"/>
-        <TalentOption identifier="bythebook"/>
-        <TalentOption identifier="dontpushit"/>
-        <TalentOption identifier="bootcamp"/>
-        <TalentOption identifier="munitionsexpertise"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="frogman" type="specialization" requires="security_primary" blocks="enforcer,gunner">
-      <TalentOptions>
-        <TalentOption identifier="boardingparty"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="scavenger"/>
-        <TalentOption identifier="slayer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="easyturtle"/>
-        <TalentOption identifier="daringdolphin"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="specops"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="enforcer" type="specialization" requires="security_primary" blocks="frogman,gunner">
-      <TalentOptions>
-        <TalentOption identifier="pacificationkit"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="beatcop"/>
-        <TalentOption identifier="stonewall"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="crustyseaman"/>
-        <TalentOption identifier="inordinateexsanguination"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="implacable"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="gunner" type="specialization" requires="security_primary" blocks="frogman,enforcer">
-      <TalentOptions>
-        <TalentOption identifier="rifleman"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="tandemfire"/>
-        <TalentOption identifier="commando"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="gunrunner"/>
-        <TalentOption identifier="extrapowder"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="warlord"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="assistant">
-    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="playingcatchup"/>
-        <TalentOption identifier="mailman"/>
-        <TalentOption identifier="skedaddle"/>
-        <TalentOption identifier="crewlayabout"/>
-        <TalentOption identifier="starterquest"/>
-        <TalentOption identifier="mule"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="revengesquad"/>
-        <TalentOption identifier="inspiringtunes"/>
-        <TalentOption identifier="bagitup"/>
-        <TalentOption identifier="peerlearning"/>
-        <TalentOption identifier="indenturedservitude"/>
-        <TalentOption identifier="jengamaster"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary" blocks="apprentice,clown">
-      <TalentOptions>
-        <TalentOption identifier="thewaitinglist"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="nonthreatening"/>
-        <TalentOption identifier="tastytarget"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="insurancepolicy"/>
-        <TalentOption identifier="anappleaday"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="thefriendswemade"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary" blocks="grayshirt,clown">
-      <TalentOptions>
-        <ShowCaseTalent identifier="apprenticeship">
-          <TalentOption identifier="apprenticeship_captain"/>
-          <TalentOption identifier="apprenticeship_doctor"/>
-          <TalentOption identifier="apprenticeship_security"/>
-          <TalentOption identifier="apprenticeship_mechanic"/>
-          <TalentOption identifier="apprenticeship_engineer"/>
-        </ShowCaseTalent>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="logisticssystems"/>
-        <TalentOption identifier="journeyman"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="loyalassistant"/>
-        <TalentOption identifier="disloyalscum"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="graduationceremony"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="clown" type="specialization" requires="assistant_primary" blocks="grayshirt,apprentice">
-      <TalentOptions>
-        <TalentOption identifier="enrollintoclowncollege"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="waterprankster"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="psychoclown"/>
-        <TalentOption identifier="chonkyhonks"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="truepotential"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="engineer">
-    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="stationengineer"/>
-        <TalentOption identifier="junctionjunkie"/>
-        <TalentOption identifier="egghead"/>
-        <TalentOption identifier="grounded"/>
-        <TalentOption identifier="remotemonitor"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="funwithfission"/>
-        <TalentOption identifier="melodicrespite"/>
-        <TalentOption identifier="submarineofthings"/>
-        <TalentOption identifier="aggressiveengineering"/>
-        <TalentOption identifier="samplecollection"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary" blocks="electrician,physicist">
-      <TalentOptions>
-        <TalentOption identifier="militaryapplications"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="heavyhitter"/>
-        <TalentOption identifier="armsrace"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="weaponartisan"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="nuclearoption"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="electrician" type="specialization" requires="engineer_primary" blocks="weaponsengineer,physicist">
-      <TalentOptions>
-        <TalentOption identifier="gridmaintainer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="pyromaniac"/>
-        <TalentOption identifier="unlimitedpower"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="betterthannew"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="lightningwizard"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="physicist" type="specialization" requires="engineer_primary" blocks="weaponsengineer,electrician">
-      <TalentOptions>
-        <TalentOption identifier="unstoppablecuriosity"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="cruising"/>
-        <TalentOption identifier="buzzing"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="dangerzone"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="phdinnuclearphysics"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="mechanic">
-    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="salvagecrew"/>
-        <TalentOption identifier="machinemaniac"/>
-        <TalentOption identifier="safetyfirst"/>
-        <TalentOption identifier="multifunctional"/>
-        <TalentOption identifier="engineengineer"/>
-        <TalentOption identifier="ballastdenizen"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="modularrepairs"/>
-        <TalentOption identifier="oiledmachinery"/>
-        <TalentOption identifier="pumpndump"/>
-        <TalentOption identifier="ironman"/>
-        <TalentOption identifier="retrofit"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary" blocks="machinist,brawler">
-      <TalentOptions>
-        <TalentOption identifier="miner"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="residualwaste"/>
-        <TalentOption identifier="massproduction"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="scrapsavant"/>
-        <TalentOption identifier="toolmaintenance"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="ironstorm"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary" blocks="scrapper,brawler">
-      <TalentOptions>
-        <TalentOption identifier="hullfixer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="tinkerer"/>
-        <TalentOption identifier="quickfixer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="letitdrain"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="robotics"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary" blocks="machinist,scrapper">
-      <TalentOptions>
-        <TalentOption identifier="iamthatguy"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="heavylifting"/>
-        <TalentOption identifier="mudraptorwrestler"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="foolhardy"/>
-        <TalentOption identifier="berserker"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="powerarmor"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-  <TalentTree jobidentifier="medicaldoctor">
-    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
-      <TalentOptions requiredtalents="2" maxchosentalents="6">
-        <TalentOption identifier="healthinsurance"/>
-        <TalentOption identifier="nobodyimportantdies"/>
-        <TalentOption identifier="exampleofhealth"/>
-        <TalentOption identifier="laresistance"/>
-        <TalentOption identifier="selfcare"/>
-        <TalentOption identifier="stayinalive"/>
-      </TalentOptions>
-      <TalentOptions requiredtalents="2" maxchosentalents="5">
-        <TalentOption identifier="firemanscarry"/>
-        <TalentOption identifier="medicalcompanion"/>
-        <TalentOption identifier="dontdieonme"/>
-        <TalentOption identifier="nopressure"/>
-        <TalentOption identifier="blooddonor"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="xenologist" type="specialization" requires="medical_primary" blocks="medic,scientist">
-      <TalentOptions>
-        <TalentOption identifier="geneharvester"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="bloodybusiness"/>
-        <TalentOption identifier="genesplicer"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="blackmarketgenes"/>
-        <TalentOption identifier="genetampering"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="geneticgenious"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="medic" type="specialization" requires="medical_primary" blocks="xenologist,scientist">
-      <TalentOptions>
-        <TalentOption identifier="medicalexpertise"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="medicalassistance"/>
-        <TalentOption identifier="emergencyresponse"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="drsubmarine"/>
-        <TalentOption identifier="vitaminsupplements"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="miracleworker"/>
-      </TalentOptions>
-    </SubTree>
-    <SubTree identifier="scientist" type="specialization" requires="medical_primary" blocks="xenologist,medic">
-      <TalentOptions>
-        <TalentOption identifier="plaguedoctor"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="deliverysystem"/>
-        <TalentOption identifier="labcontacts"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="supersoldiers"/>
-        <TalentOption identifier="whatastench"/>
-      </TalentOptions>
-      <TalentOptions>
-        <TalentOption identifier="macrodosing"/>
-      </TalentOptions>
-    </SubTree>
-  </TalentTree>
-  
-</TalentTrees>
+<?xml version="1.0" encoding="utf-8"?>
+<TalentTrees>
+  <TalentTree jobidentifier="captain">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="securityofficer">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="assistant">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="engineer">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="mechanic">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
+  <TalentTree jobidentifier="medicaldoctor">
+    <SubTree identifier="captain_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="bountyhunter"/>
+        <TalentOption identifier="logisticsexpert"/>
+        <TalentOption identifier="prodigy"/>
+        <TalentOption identifier="inspirationalleader"/>
+        <TalentOption identifier="veteran"/>
+        <TalentOption identifier="travelingtradesman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="emergencymaneuvers"/>
+        <TalentOption identifier="sailorwithnoname"/>
+        <TalentOption identifier="camaraderie"/>
+        <TalentOption identifier="downwiththeship"/>
+        <TalentOption identifier="gunsmith"/>
+        <TalentOption identifier="steadytune"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunslinger" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="quickdraw"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="lonewolf"/>
+        <TalentOption identifier="deputy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="drunkensailor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="bigguns"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="skipper" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="leadingbyexample"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="helmsman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="inspiringpresence"/>
+        <TalentOption identifier="trickledown"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="family"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="politician" type="specialization" requires="captain_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="commendations"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="yourreputation"/>
+        <TalentOption identifier="affiliation"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="campaigning"/>
+        <TalentOption identifier="networking"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="figurehead"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="security_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="protectandserve"/>
+        <TalentOption identifier="warstories"/>
+        <TalentOption identifier="firstaidtraining"/>
+        <TalentOption identifier="physicalconditioning"/>
+        <TalentOption identifier="swole"/>
+        <TalentOption identifier="buff"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="weaponsmith"/>
+        <TalentOption identifier="bythebook"/>
+        <TalentOption identifier="dontpushit"/>
+        <TalentOption identifier="bootcamp"/>
+        <TalentOption identifier="munitionsexpertise"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="frogman" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="boardingparty"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scavenger"/>
+        <TalentOption identifier="slayer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="easyturtle"/>
+        <TalentOption identifier="daringdolphin"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="specops"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="enforcer" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="pacificationkit"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="beatcop"/>
+        <TalentOption identifier="stonewall"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="crustyseaman"/>
+        <TalentOption identifier="inordinateexsanguination"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="implacable"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="gunner" type="specialization" requires="security_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="rifleman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tandemfire"/>
+        <TalentOption identifier="commando"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="gunrunner"/>
+        <TalentOption identifier="extrapowder"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="warlord"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="assistant_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="playingcatchup"/>
+        <TalentOption identifier="mailman"/>
+        <TalentOption identifier="skedaddle"/>
+        <TalentOption identifier="crewlayabout"/>
+        <TalentOption identifier="starterquest"/>
+        <TalentOption identifier="mule"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="revengesquad"/>
+        <TalentOption identifier="inspiringtunes"/>
+        <TalentOption identifier="bagitup"/>
+        <TalentOption identifier="peerlearning"/>
+        <TalentOption identifier="indenturedservitude"/>
+        <TalentOption identifier="jengamaster"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="grayshirt" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thewaitinglist"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="nonthreatening"/>
+        <TalentOption identifier="tastytarget"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="insurancepolicy"/>
+        <TalentOption identifier="anappleaday"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="thefriendswemade"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="apprentice" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <ShowCaseTalent identifier="apprenticeship">
+          <TalentOption identifier="apprenticeship_captain"/>
+          <TalentOption identifier="apprenticeship_doctor"/>
+          <TalentOption identifier="apprenticeship_security"/>
+          <TalentOption identifier="apprenticeship_mechanic"/>
+          <TalentOption identifier="apprenticeship_engineer"/>
+        </ShowCaseTalent>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="logisticssystems"/>
+        <TalentOption identifier="journeyman"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="loyalassistant"/>
+        <TalentOption identifier="disloyalscum"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="graduationceremony"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="clown" type="specialization" requires="assistant_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="enrollintoclowncollege"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="waterprankster"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="psychoclown"/>
+        <TalentOption identifier="chonkyhonks"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="truepotential"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="engineer_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="stationengineer"/>
+        <TalentOption identifier="junctionjunkie"/>
+        <TalentOption identifier="egghead"/>
+        <TalentOption identifier="grounded"/>
+        <TalentOption identifier="remotemonitor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="funwithfission"/>
+        <TalentOption identifier="melodicrespite"/>
+        <TalentOption identifier="submarineofthings"/>
+        <TalentOption identifier="aggressiveengineering"/>
+        <TalentOption identifier="samplecollection"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="weaponsengineer" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="militaryapplications"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavyhitter"/>
+        <TalentOption identifier="armsrace"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="weaponartisan"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="nuclearoption"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="electrician" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="gridmaintainer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="pyromaniac"/>
+        <TalentOption identifier="unlimitedpower"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="betterthannew"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="lightningwizard"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="physicist" type="specialization" requires="engineer_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="unstoppablecuriosity"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="cruising"/>
+        <TalentOption identifier="buzzing"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="dangerzone"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="phdinnuclearphysics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="mechanic_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="salvagecrew"/>
+        <TalentOption identifier="machinemaniac"/>
+        <TalentOption identifier="safetyfirst"/>
+        <TalentOption identifier="multifunctional"/>
+        <TalentOption identifier="engineengineer"/>
+        <TalentOption identifier="ballastdenizen"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="modularrepairs"/>
+        <TalentOption identifier="oiledmachinery"/>
+        <TalentOption identifier="pumpndump"/>
+        <TalentOption identifier="ironman"/>
+        <TalentOption identifier="retrofit"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scrapper" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miner"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="residualwaste"/>
+        <TalentOption identifier="massproduction"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="scrapsavant"/>
+        <TalentOption identifier="toolmaintenance"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="ironstorm"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="machinist" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="hullfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="tinkerer"/>
+        <TalentOption identifier="quickfixer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="letitdrain"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="robotics"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="brawler" type="specialization" requires="mechanic_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="iamthatguy"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="heavylifting"/>
+        <TalentOption identifier="mudraptorwrestler"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="foolhardy"/>
+        <TalentOption identifier="berserker"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="powerarmor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medical_primary" nameidentifier="talenttree.primary" type="primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="6">
+        <TalentOption identifier="healthinsurance"/>
+        <TalentOption identifier="nobodyimportantdies"/>
+        <TalentOption identifier="exampleofhealth"/>
+        <TalentOption identifier="laresistance"/>
+        <TalentOption identifier="selfcare"/>
+        <TalentOption identifier="stayinalive"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="5">
+        <TalentOption identifier="firemanscarry"/>
+        <TalentOption identifier="medicalcompanion"/>
+        <TalentOption identifier="dontdieonme"/>
+        <TalentOption identifier="nopressure"/>
+        <TalentOption identifier="blooddonor"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="xenologist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneharvester"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="bloodybusiness"/>
+        <TalentOption identifier="genesplicer"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="blackmarketgenes"/>
+        <TalentOption identifier="genetampering"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="geneticgenious"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="medic" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="medicalexpertise"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="medicalassistance"/>
+        <TalentOption identifier="emergencyresponse"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="drsubmarine"/>
+        <TalentOption identifier="vitaminsupplements"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="miracleworker"/>
+      </TalentOptions>
+    </SubTree>
+    <SubTree identifier="scientist" type="specialization" requires="medical_primary">
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="plaguedoctor"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="deliverysystem"/>
+        <TalentOption identifier="labcontacts"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="2">
+        <TalentOption identifier="supersoldiers"/>
+        <TalentOption identifier="whatastench"/>
+      </TalentOptions>
+      <TalentOptions requiredtalents="1" maxchosentalents="1">
+        <TalentOption identifier="macrodosing"/>
+      </TalentOptions>
+    </SubTree>
+  </TalentTree>
+  
</TalentTrees>
diff --git a/Content/Upgrades/UpgradeModules.xml b/Content/Upgrades/UpgradeModules.xml
index 2bccc7db..677fd26e 100644
--- a/Content/Upgrades/UpgradeModules.xml
+++ b/Content/Upgrades/UpgradeModules.xml
@@ -65,12 +65,12 @@
   <!-- Work in progress. TODO: ResourceCost, MaxLevel per class and tier -->
   <!-- WALLS -->
 
-  <UpgradeModule identifier="increasewallhealth" maxlevel="6" categories="walls" increaseontooltip="20">
+  <UpgradeModule identifier="increasewallhealth" maxlevel="6" categories="walls" increaseontooltip="40">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+400%"/>
     <ResourceCost item="steel" amount="5" levels="1-2"/>
     <ResourceCost item="titaniumaluminiumalloy" amount="5" levels="3-4"/>
     <ResourceCost item="physicorium" amount="5" levels="5-6"/>
-    <Structure maxhealth="+20%" crushdepth="+15%"/>
+    <Structure maxhealth="+40%" crushdepth="+15%"/>
     <MaxLevel tier="1" level="2"/>
     <MaxLevel tier="2" level="4"/>
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,640,128,128" origin="0.5,0.5"/>
@@ -78,31 +78,31 @@
 
   <!-- FABRICATOR -->
 
-  <UpgradeModule identifier="increasefabricationspeed" maxlevel="3" categories="fabricators" increaseontooltip="30">
+  <UpgradeModule identifier="increasefabricationspeed" maxlevel="3" categories="fabricators" increaseontooltip="60">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="transport" level="+1"/>
-    <Fabricator fabricationspeed="+30%" powerconsumption="+5%"/>
+    <Fabricator fabricationspeed="+60%" powerconsumption="+5%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="704,768,64,64" depth="0.75" origin="0.5,0.5"/>-->-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="0,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- DECONSTRUCTOR -->
 
-  <UpgradeModule identifier="decreasedeconstructiontime" maxlevel="3" categories="deconstructors" increaseontooltip="30">
+  <UpgradeModule identifier="decreasedeconstructiontime" maxlevel="3" categories="deconstructors" increaseontooltip="60">
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="transport" level="+1"/>
-    <Deconstructor deconstructionspeed="+30%" powerconsumption="+5%"/>
+    <Deconstructor deconstructionspeed="+60%" powerconsumption="+5%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="448,192,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="768,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- TURRET -->
 
-  <UpgradeModule identifier="turretdecreasepowerconsumption" maxlevel="3" categories="weapons" increaseontooltip="8">
+  <UpgradeModule identifier="turretdecreasepowerconsumption" maxlevel="3" categories="weapons" increaseontooltip="16">
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
@@ -112,75 +112,84 @@
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,896,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="turretincreaserotationlowskill" maxlevel="3" categories="weapons" increaseontooltip="20">
+  <UpgradeModule identifier="turretincreaserotationlowskill" maxlevel="3" categories="weapons" increaseontooltip="40">
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="attack" level="+1"/>
-    <Turret rotationspeedlowskill="+20%"/>
+    <Turret rotationspeedlowskill="+40%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="320,384,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="turretincreaseoffsetonselected" maxlevel="3" categories="weapons" increaseontooltip="4">
+  <UpgradeModule identifier="turretincreaseoffsetonselected" maxlevel="3" categories="weapons" increaseontooltip="8">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="attack" level="+1"/>
     <MaxLevel class="scout" level="+1"/>
-    <Item offsetonselectedmultiplier="+4%"/>
-    <LightComponent range="+16%"/>
+    <Item offsetonselectedmultiplier="+8%"/>
+    <LightComponent range="+32%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="768,320,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="384,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- REACTOR -->
 
-  <UpgradeModule identifier="increasereactoroutput" maxlevel="3" categories="reactors" increaseontooltip="3">
+  <UpgradeModule identifier="increasereactoroutput" maxlevel="3" categories="reactors" increaseontooltip="6">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Reactor maxpoweroutput="+3%"/>
+    <Reactor maxpoweroutput="+6%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="576,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="decreasefuelconsumption" maxlevel="3" categories="reactors" increaseontooltip="-20">
+  <UpgradeModule identifier="decreasefuelconsumption" maxlevel="3" categories="reactors" increaseontooltip="-40">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="transport" level="+1"/>
-    <Reactor fuelconsumptionrate="-20%" meltdowndelay="+20%"/>
+    <Reactor fuelconsumptionrate="-20%" meltdowndelay="+40%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="384,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- PUMP -->
 
-  <UpgradeModule identifier="increasemaxpumpflow" maxlevel="3" categories="pumps" increaseontooltip="10">
+  <UpgradeModule identifier="increasemaxpumpflow" maxlevel="3" categories="pumps" increaseontooltip="20">
     <Price baseprice="3000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Pump maxflow="+10%" powerconsumption="-5%"/>
+    <Pump maxflow="+20%" powerconsumption="-5%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="896,256,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- ENGINE -->
 
-  <UpgradeModule identifier="increaseenginemaxforce" maxlevel="3" categories="engines" increaseontooltip="8">
+  <UpgradeModule identifier="increaseenginemaxforce" maxlevel="3" categories="engines" increaseontooltip="16">
     <Price baseprice="2500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
     <MaxLevel class="scout" level="+1"/>
-    <Engine maxforce="+8%" />
+    <Engine maxforce="+16%" />
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="256,128,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="896,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- BATTERIES -->
 
-  <UpgradeModule identifier="increasebatterycapacity" maxlevel="3" categories="batteries" increaseontooltip="20">
+  <UpgradeModule identifier="increasebatterycapacity" maxlevel="3" categories="batteries" increaseontooltip="40">
+    <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
+    <MaxLevel tier="1" level="1"/>
+    <MaxLevel tier="2" level="2"/>
+    <PowerContainer capacity="+40%"/>
+    <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
+    <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5"/>
+  </UpgradeModule>
+
+  <UpgradeModule identifier="increasesupercapacitorcapacity" maxlevel="3" categories="supercapacitors" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
@@ -189,66 +198,57 @@
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="increasesupercapacitorcapacity" maxlevel="3" categories="supercapacitors" increaseontooltip="10">
+  <UpgradeModule identifier="increasebatteryrechargespeed" maxlevel="3" categories="batteries" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <PowerContainer capacity="+10%"/>
-    <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="832,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
-    <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="512,768,128,128" origin="0.5,0.5"/>
-  </UpgradeModule>
-
-  <UpgradeModule identifier="increasebatteryrechargespeed" maxlevel="3" categories="batteries" increaseontooltip="10">
-    <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
-    <MaxLevel tier="1" level="1"/>
-    <MaxLevel tier="2" level="2"/>
-    <PowerContainer maxrechargespeed="+10%"/>
+    <PowerContainer maxrechargespeed="+20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="increasesupercapacitorrechargespeed" maxlevel="3" categories="supercapacitors" increaseontooltip="10">
+  <UpgradeModule identifier="increasesupercapacitorrechargespeed" maxlevel="3" categories="supercapacitors" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <PowerContainer maxrechargespeed="+10%"/>
+    <PowerContainer maxrechargespeed="+20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="640,768,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- JUNCTION BOXES -->
 
-  <UpgradeModule identifier="increaseovervoltageresistance" maxlevel="3" categories="junctionboxes" increaseontooltip="10">
+  <UpgradeModule identifier="increaseovervoltageresistance" maxlevel="3" categories="junctionboxes" increaseontooltip="20">
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <PowerTransfer fireprobability="-10%" overloadvoltage="+10%"/>
+    <PowerTransfer fireprobability="-10%" overloadvoltage="+20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="63,320,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,640,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- MACHINE REPAIRS -->
 
-  <UpgradeModule nameidentifier="increasemaxcondition" descriptionidentifier="increasemaxcondition" identifier="decreasedeteriorationspeed" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="20" >
+  <UpgradeModule nameidentifier="increasemaxcondition" descriptionidentifier="increasemaxcondition" identifier="decreasedeteriorationspeed" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="40" >
     <Price baseprice="1500" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Item healthmultiplier="+0.2"/>
+    <Item healthmultiplier="+0.4"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="512,0,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="128,896,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
-  <UpgradeModule identifier="decreaselowskillfixduration" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="10">
+  <UpgradeModule identifier="decreaselowskillfixduration" maxlevel="3" categories="electricaldevices,mechanicaldevices" increaseontooltip="20">
     <Price baseprice="1000" increaselow="+0%" increasehigh="+200%"/>
     <MaxLevel tier="1" level="1"/>
     <MaxLevel tier="2" level="2"/>
-    <Repairable fixdurationlowskill="-10%" skillrequirementmultiplier="-10%"/>
+    <Repairable fixdurationlowskill="-20%" skillrequirementmultiplier="-20%"/>
     <!--<DecorativeSprite texture="Content/Items/InventoryIconAtlas.png" sourcerect="64,64,64,64" depth="0.75" origin="0.5,0.5"/>-->
     <Sprite texture="Content/UI/CampaignUIAtlas2.png" sourcerect="256,896,128,128" origin="0.5,0.5"/>
   </UpgradeModule>
 
   <!-- MONITORS -->
-  <UpgradeModule identifier="enablemineralscanner" maxlevel="0" categories="monitors" increaseontooltip="100">
+  <UpgradeModule identifier="enablemineralscanner" maxlevel="0" categories="monitors" increaseontooltip="200">
     <MaxLevel class="scout" level="+1"/>
     <MaxLevel class="transport" level="+1"/>
     <Price baseprice="2000" increaselow="+0%" increasehigh="+200%"/>
diff --git a/Daedalic Entertainment GmbH b/Daedalic Entertainment GmbH
index 71a78e31..f123a373 160000
--- a/Daedalic Entertainment GmbH	
+++ b/Daedalic Entertainment GmbH	
@@ -1 +1 @@
-Subproject commit 71a78e31c59488035ad3a374e37ceed1e4bd0c89
+Subproject commit f123a373ec507160923850c602254e58839d58a5