diff --git a/Defs/TempTestDef.xml b/Defs/TempTestDef.xml
deleted file mode 100644
index 9e7ac47f58..0000000000
--- a/Defs/TempTestDef.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-  <ThingDef ParentName="TurretAutoBase">
-    <defName>Turret_GenericAmmoUserTest</defName>
-    <label>generic ammouser test turret</label>
-    <constructionSkillPrerequisite>6</constructionSkillPrerequisite>
-    <graphicData>
-      <texPath>Things/Building/Turrets/MachineGunBase</texPath>
-      <shadowData>
-        <volume>(0.27,0.25,0.27)</volume>
-        <offset>(0,0,0)</offset>
-      </shadowData>
-    </graphicData>
-    <uiIconPath>UI/Icons/Turrets/MediumAutoTurret_uiIcon</uiIconPath>
-    <statBases>
-      <WorkToBuild>20000</WorkToBuild>
-      <MaxHitPoints>200</MaxHitPoints>
-      <Flammability>0.6</Flammability>
-      <Mass>30</Mass>
-      <Bulk>40</Bulk>
-      <AimingAccuracy>0.5</AimingAccuracy>
-      <ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
-    </statBases>
-    <description>Automatic turret equiped with a full powered cartridge machine gun. Fairly resistant to damage.</description>
-    <costList>
-      <Steel>150</Steel>
-      <ComponentIndustrial>8</ComponentIndustrial>
-    </costList>
-    <building>
-      <ai_combatDangerous>true</ai_combatDangerous>
-      <turretGunDef>Gun_GenericAmmoUserTest</turretGunDef>
-    </building>
-    <placeWorkers>
-      <li>PlaceWorker_TurretTop</li>
-      <li>PlaceWorker_ShowTurretRadius</li>
-    </placeWorkers>
-    <comps>
-      <li Class="CompProperties_Power">
-        <compClass>CompPowerTrader</compClass>
-        <basePowerConsumption>150</basePowerConsumption>
-      </li>
-    </comps>
-    <minifiedDef>MinifiedThing</minifiedDef>
-    <researchPrerequisites>
-      <li>GunTurrets</li>
-      <li>PrecisionRifling</li>
-    </researchPrerequisites>
-  </ThingDef>
-
-  <ThingDef ParentName="BaseAutoTurretGun">
-    <defName>Gun_GenericAmmoUserTest</defName>
-    <label>medium turret gun</label>
-    <graphicData>
-      <texPath>Things/Building/Turrets/MediumTurret_Top</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <description>Full powered cartridge gun on a turret mount.</description>
-    <statBases>
-      <SightsEfficiency>1</SightsEfficiency>
-      <ShotSpread>0.05</ShotSpread>
-      <SwayFactor>0.84</SwayFactor>
-      <RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-      <Mass>10</Mass>
-    </statBases>
-    <verbs>
-      <li Class="CombatExtended.VerbPropertiesCE">
-        <recoilAmount>0.95</recoilAmount>
-        <verbClass>CombatExtended.Verb_ShootCE</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-        <warmupTime>1.3</warmupTime>
-        <range>55</range>
-        <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-        <burstShotCount>10</burstShotCount>
-        <soundCast>MediumMG</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>11</muzzleFlashScale>
-        <recoilPattern>Mounted</recoilPattern>
-      </li>
-    </verbs>
-    <comps>
-      <li Class="CombatExtended.CompProperties_AmmoUser">
-        <compClass>CombatExtended.CompAmmoUserGeneric</compClass>
-        <magazineSize>80</magazineSize>
-        <reloadTime>7.8</reloadTime>
-        <ammoSet>AmmoSet_762x51mmNATO</ammoSet>
-      </li>
-    </comps>
-  </ThingDef>
-
-  <ThingDef ParentName="TurretAutoBase">
-    <defName>Turret_GenericAmmoUserTestII</defName>
-    <label>generic ammouser test .303 turret</label>
-    <constructionSkillPrerequisite>6</constructionSkillPrerequisite>
-    <graphicData>
-      <texPath>Things/Building/Turrets/MachineGunBase</texPath>
-      <shadowData>
-        <volume>(0.27,0.25,0.27)</volume>
-        <offset>(0,0,0)</offset>
-      </shadowData>
-    </graphicData>
-    <uiIconPath>UI/Icons/Turrets/MediumAutoTurret_uiIcon</uiIconPath>
-    <statBases>
-      <WorkToBuild>20000</WorkToBuild>
-      <MaxHitPoints>200</MaxHitPoints>
-      <Flammability>0.6</Flammability>
-      <Mass>30</Mass>
-      <Bulk>40</Bulk>
-      <AimingAccuracy>0.5</AimingAccuracy>
-      <ShootingAccuracyTurret>0.75</ShootingAccuracyTurret>
-    </statBases>
-    <description>Automatic turret equiped with a full powered cartridge machine gun. Fairly resistant to damage.</description>
-    <costList>
-      <Steel>150</Steel>
-      <ComponentIndustrial>8</ComponentIndustrial>
-    </costList>
-    <building>
-      <ai_combatDangerous>true</ai_combatDangerous>
-      <turretGunDef>Gun_GenericAmmoUserTestII</turretGunDef>
-    </building>
-    <placeWorkers>
-      <li>PlaceWorker_TurretTop</li>
-      <li>PlaceWorker_ShowTurretRadius</li>
-    </placeWorkers>
-    <comps>
-      <li Class="CompProperties_Power">
-        <compClass>CompPowerTrader</compClass>
-        <basePowerConsumption>150</basePowerConsumption>
-      </li>
-    </comps>
-    <minifiedDef>MinifiedThing</minifiedDef>
-    <researchPrerequisites>
-      <li>GunTurrets</li>
-      <li>PrecisionRifling</li>
-    </researchPrerequisites>
-  </ThingDef>
-
-  <ThingDef ParentName="BaseAutoTurretGun">
-    <defName>Gun_GenericAmmoUserTestII</defName>
-    <label>medium turret gun</label>
-    <graphicData>
-      <texPath>Things/Building/Turrets/MediumTurret_Top</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <description>Full powered cartridge gun on a turret mount.</description>
-    <statBases>
-      <SightsEfficiency>1</SightsEfficiency>
-      <ShotSpread>0.05</ShotSpread>
-      <SwayFactor>0.84</SwayFactor>
-      <RangedWeapon_Cooldown>0.36</RangedWeapon_Cooldown>
-      <Mass>10</Mass>
-    </statBases>
-    <verbs>
-      <li Class="CombatExtended.VerbPropertiesCE">
-        <recoilAmount>0.95</recoilAmount>
-        <verbClass>CombatExtended.Verb_ShootCE</verbClass>
-        <hasStandardCommand>true</hasStandardCommand>
-        <defaultProjectile>Bullet_762x51mmNATO_FMJ</defaultProjectile>
-        <warmupTime>1.3</warmupTime>
-        <range>55</range>
-        <ticksBetweenBurstShots>6</ticksBetweenBurstShots>
-        <burstShotCount>10</burstShotCount>
-        <soundCast>MediumMG</soundCast>
-        <soundCastTail>GunTail_Medium</soundCastTail>
-        <muzzleFlashScale>11</muzzleFlashScale>
-        <recoilPattern>Mounted</recoilPattern>
-      </li>
-    </verbs>
-    <comps>
-      <li Class="CombatExtended.CompProperties_AmmoUser">
-        <magazineSize>80</magazineSize>
-        <reloadTime>7.8</reloadTime>
-        <ammoSet>AmmoSet_303British</ammoSet>
-      </li>
-    </comps>
-  </ThingDef>
-</Defs>
\ No newline at end of file
diff --git a/Defs/ThingDefs_Buildings/AutoLoaderExample.xml b/Defs/ThingDefs_Buildings/AutoLoaderExample.xml
index 3484c6b900..4a95a970f1 100644
--- a/Defs/ThingDefs_Buildings/AutoLoaderExample.xml
+++ b/Defs/ThingDefs_Buildings/AutoLoaderExample.xml
@@ -1,119 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-  <ThingDef ParentName="BuildingBase">
-    <defName>BDsAutoLoaderTest</defName>
-    <label>auto loader test</label>
-    <description>An ammo crate with magical autoloaders.</description>
+  <!--
+	
+		===Auto loader example def
+	
+	<ThingDef ParentName="BuildingBase">
+		<defName>BDsAutoLoaderTest</defName>
+		<label>auto loader test</label>
+		<description>An ammo crate with magical autoloaders.</description>
 
-    <thingClass>CombatExtended.Building_AutoLoaderCE</thingClass>
-    <tickerType>Normal</tickerType>
-    <drawerType>MapMeshAndRealTime</drawerType>
+		===Thing class, ticker type and drawer type are mandatory===
 
-    <comps>
-      <li Class="CombatExtended.CompProperties_AmmoUser">
-        <compClass>CombatExtended.CompAmmoUserGeneric</compClass>
+		<thingClass>CombatExtended.Building_AutoLoaderCE</thingClass>
+		<tickerType>Normal</tickerType>
+		<drawerType>MapMeshAndRealTime</drawerType>
+
+		===This Ammo user is the autoloader's ammo capacity and reload time===
+
+		<comps>
+      <li Class="CombatExtended.CompProperties_AmmoListUser">
+        <compClass>CombatExtended.CompAmmoListUserGeneric</compClass>
         <magazineSize>400</magazineSize>
         <reloadTime>7.8</reloadTime>
         <ammoSet>AmmoSet_762x51mmNATO</ammoSet>
+        <additionalAmmoSets>
+        <li>AmmoSet_44Magnum</li>
+        </additionalAmmoSets>
       </li>
-
-      <li Class="CompProperties_Mannable">
-        <manWorkType>Hauling</manWorkType>
-      </li>
-      <li Class="CompProperties_Power">
-        <compClass>CompPowerTrader</compClass>
-        <basePowerConsumption>300</basePowerConsumption>
-      </li>
-    </comps>
-
+			
+		===If CompMannable and CompPowerTrader are present, they'll be taken into account too, same goes for CompInitiatable and CompCanBeDormant===
+			
+			<li Class="CompProperties_Mannable">
+				<manWorkType>Hauling</manWorkType>
+			</li>
+			<li Class="CompProperties_Power">
+				<compClass>CompPowerTrader</compClass>
+				<basePowerConsumption>300</basePowerConsumption>
+			</li>
+		</comps>
+    
+		===Different graphics can be applied at empty, half full (above 0) and full (above 75%) if this mod extension exists===
+    
     <modExtensions>
-      <li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
-        <fullGraphic>
-          <texPath>Things/Building/Misc/ToolCabinet</texPath>
-          <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>(2,1)</drawSize>
-          <color>(0,0,0)</color>
-          <damageData>
-            <cornerTL>Damage/Corner</cornerTL>
-            <cornerTR>Damage/Corner</cornerTR>
-            <cornerBL>Damage/Corner</cornerBL>
-            <cornerBR>Damage/Corner</cornerBR>
-          </damageData>
-        </fullGraphic>
-
+			<li Class="CombatExtended.ModExtension_AutoLoaderGraphics">
+				<fullGraphic>
+					<texPath>Things/Building/Misc/ToolCabinet</texPath>
+					<graphicClass>Graphic_Multi</graphicClass>
+					<drawSize>(2,1)</drawSize>
+					<color>(0,0,0)</color>
+					<damageData>
+						<cornerTL>Damage/Corner</cornerTL>
+						<cornerTR>Damage/Corner</cornerTR>
+						<cornerBL>Damage/Corner</cornerBL>
+						<cornerBR>Damage/Corner</cornerBR>
+					</damageData>
+				</fullGraphic>
+        
         <halfFullGraphic>
-          <texPath>Things/Building/Misc/ToolCabinet</texPath>
-          <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>(2,1)</drawSize>
-          <color>(0,114,0)</color>
-          <damageData>
-            <cornerTL>Damage/Corner</cornerTL>
-            <cornerTR>Damage/Corner</cornerTR>
-            <cornerBL>Damage/Corner</cornerBL>
-            <cornerBR>Damage/Corner</cornerBR>
-          </damageData>
+
+		===This is left deliberately empty, The code should fall back to default graphic if the current situation's graphics is left blank===
+
         </halfFullGraphic>
+        
+				<emptyGraphic>
+					<texPath>Things/Building/Misc/ToolCabinet</texPath>
+					<graphicClass>Graphic_Multi</graphicClass>
+					<drawSize>(2,1)</drawSize>
+					<color>(0,0,114)</color>
+					<damageData>
+						<cornerTL>Damage/Corner</cornerTL>
+						<cornerTR>Damage/Corner</cornerTR>
+						<cornerBL>Damage/Corner</cornerBL>
+						<cornerBR>Damage/Corner</cornerBR>
+					</damageData>
+				</emptyGraphic>
+      
+===Only turrets in this list will be reloaded, if it's not empty===
+      
+        <allowedTurrets>
+          <li>Turret_Heavy</li>
+        </allowedTurrets>
+        
+==The tag here is buildingTags under building node, Not weapon tag. See the def of KPV for example
+        
+        <allowedTurretTags>
+          <li>CE_TurretHeavy</li>
+        </allowedTurretTags>
 
-        <emptyGraphic>
-          <texPath>Things/Building/Misc/ToolCabinet</texPath>
-          <graphicClass>Graphic_Multi</graphicClass>
-          <drawSize>(2,1)</drawSize>
-          <color>(0,0,114)</color>
-          <damageData>
-            <cornerTL>Damage/Corner</cornerTL>
-            <cornerTR>Damage/Corner</cornerTR>
-            <cornerBL>Damage/Corner</cornerBL>
-            <cornerBR>Damage/Corner</cornerBR>
-          </damageData>
-        </emptyGraphic>
+===if left empty, a default machine cranking sound will play===
 
         <reloadingSustainer>Ingest_Drink</reloadingSustainer>
+      
+===if left empty, the intereact sound of the turret gun will play===
 
         <reloadCompleteSound>Pawn_Chicken_Call</reloadCompleteSound>
       </li>
-    </modExtensions>
+	  </modExtensions>
+        
+		===Generic stuffs here===
 
-    <graphicData>
-      <texPath>Things/Building/Misc/ToolCabinet</texPath>
-      <graphicClass>Graphic_Multi</graphicClass>
-      <drawSize>(2,1)</drawSize>
-      <color>(96,114,95)</color>
-      <damageData>
-        <cornerTL>Damage/Corner</cornerTL>
-        <cornerTR>Damage/Corner</cornerTR>
-        <cornerBL>Damage/Corner</cornerBL>
-        <cornerBR>Damage/Corner</cornerBR>
-      </damageData>
-    </graphicData>
-    <altitudeLayer>Building</altitudeLayer>
-    <passability>PassThroughOnly</passability>
-    <castEdgeShadows>true</castEdgeShadows>
-    <staticSunShadowHeight>0.35</staticSunShadowHeight>
+		<graphicData>
+			<texPath>Things/Building/Misc/ToolCabinet</texPath>
+			<graphicClass>Graphic_Multi</graphicClass>
+			<drawSize>(2,1)</drawSize>
+			<color>(96,114,95)</color>
+			<damageData>
+				<cornerTL>Damage/Corner</cornerTL>
+				<cornerTR>Damage/Corner</cornerTR>
+				<cornerBL>Damage/Corner</cornerBL>
+				<cornerBR>Damage/Corner</cornerBR>
+			</damageData>
+		</graphicData>
+		<altitudeLayer>Building</altitudeLayer>
+		<passability>PassThroughOnly</passability>
+		<castEdgeShadows>true</castEdgeShadows>
+		<staticSunShadowHeight>0.35</staticSunShadowHeight>
     <hasInteractionCell>True</hasInteractionCell>
     <interactionCellOffset>(0,0,-1)</interactionCellOffset>
-    <fillPercent>0.5</fillPercent>
-    <canOverlapZones>false</canOverlapZones>
-    <pathCost>42</pathCost>
-    <size>(2,1)</size>
-    <costList>
-      <Steel>200</Steel>
-    </costList>
-    <building>
-      <destroySound>BuildingDestroyed_Metal_Small</destroySound>
-    </building>
-    <statBases>
-      <MaxHitPoints>100</MaxHitPoints>
-      <WorkToBuild>1800</WorkToBuild>
-      <Mass>20</Mass>
-      <Flammability>0.5</Flammability>
-
-      <ReloadSpeed>0.5</ReloadSpeed>
-    </statBases>
-    <designationCategory>Misc</designationCategory>
-    <minifiedDef>MinifiedThing</minifiedDef>
-    <thingCategories>
-      <li>BuildingsMisc</li>
-    </thingCategories>
-  </ThingDef>
+		<fillPercent>0.5</fillPercent>
+		<canOverlapZones>false</canOverlapZones>
+		<pathCost>42</pathCost>
+		<size>(2,1)</size>
+		<costList>
+			<Steel>200</Steel>
+		</costList>
+		<building>
+			<destroySound>BuildingDestroyed_Metal_Small</destroySound>
+		</building>
+		<statBases>
+			<MaxHitPoints>100</MaxHitPoints>
+			<WorkToBuild>1800</WorkToBuild>
+			<Mass>20</Mass>
+			<Flammability>0.5</Flammability>
+			
+		===Look at this reload speed. this controls how fast/slow autoloader loads===
+			
+			<ReloadSpeed>0.5</ReloadSpeed>
+		</statBases>
+		<designationCategory>Misc</designationCategory>
+		<minifiedDef>MinifiedThing</minifiedDef>
+		<thingCategories>
+			<li>BuildingsMisc</li>
+		</thingCategories>
+	</ThingDef>
+	-->
 
 </Defs>
\ No newline at end of file