diff --git a/About/About.xml b/About/About.xml
index 649c8cf1..8d179a8e 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -50,5 +50,7 @@ JecsTools.PatchOperationModLoaded
 Additions by ChJees
 Additions by roxxploxx
 Additions by Swenzi
-Additions and transpilers by Erdelf</description>
+Additions and transpilers by Erdelf
+Xen added himself to the credits for extensive hours of testing, debugging, some small fixes,
+and - for when Jec said "Hey should we make this into a public toolset for people to take advantage of all this cool stuff?" - Xen said, "Hell yes - this is awesome stuff - people will love it!"</description>
 </ModMetaData>
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
index d849eee4..ba7276e1 100644
Binary files a/Assemblies/AbilityUser.dll and b/Assemblies/AbilityUser.dll differ
diff --git a/Assemblies/CompDeflector.dll b/Assemblies/CompDeflector.dll
index 9293874e..6693d60c 100644
Binary files a/Assemblies/CompDeflector.dll and b/Assemblies/CompDeflector.dll differ
diff --git a/Source/.idea/.idea.JecsTools/.idea/contentModel.xml b/Source/.idea/.idea.JecsTools/.idea/contentModel.xml
index 09ebf7c5..066a6c98 100644
--- a/Source/.idea/.idea.JecsTools/.idea/contentModel.xml
+++ b/Source/.idea/.idea.JecsTools/.idea/contentModel.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelStore">
-    <e p="C:\Program Files (x86)\Steam\steamapps\common\RimWorld\ModsWorkspace\JecsTools\Assemblies" t="ExcludeRecursive" />
-    <e p="C:\Program Files (x86)\Steam\steamapps\common\RimWorld\ModsWorkspace\JecsTools\Source" t="IncludeFlat">
+    <e p="C:\Users\cloud\.Rider2017.2\system\resharper-host\local\Transient\ReSharperHost\v10\SolutionCaches\_JecsTools.1408684828.00" t="ExcludeRecursive" />
+    <e p="H:\SteamSSD\steamapps\common\RimWorld\Mods\JecsTools - master\Source" t="IncludeFlat">
       <e p="AllModdingComponents\AbilityUserAI" t="IncludeRecursive">
         <e p="AbilityUserAI.csproj" t="IncludeRecursive" />
         <e p="AI" t="Include">
@@ -49,6 +49,7 @@
         <e p="AoEProperties.cs" t="Include" />
         <e p="ApplyHediffs.cs" t="Include" />
         <e p="ApplyMentalStates.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompAbilityItem.cs" t="Include" />
         <e p="CompAbilityUser.csproj" t="IncludeRecursive" />
         <e p="CompProperties_AbilityItem.cs" t="Include" />
@@ -90,6 +91,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompActivatableEffect" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompActivatableEffect.cs" t="Include" />
         <e p="CompActivatableEffect.csproj" t="IncludeRecursive" />
         <e p="CompProperties_ActivatableEffect.cs" t="Include" />
@@ -100,6 +102,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompAnimated" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompAnimated.cs" t="Include" />
         <e p="CompAnimated.csproj" t="IncludeRecursive" />
         <e p="CompProperties_Animated.cs" t="Include" />
@@ -109,6 +112,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompBalloon" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompBalloon.cs" t="Include" />
         <e p="CompBalloon.csproj" t="IncludeRecursive" />
         <e p="CompProperties_Balloon.cs" t="Include" />
@@ -118,6 +122,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompDeflector" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompDeflector.cs" t="Include" />
         <e p="CompDeflector.csproj" t="IncludeRecursive" />
         <e p="CompDeflectorDefOf.cs" t="Include" />
@@ -132,6 +137,7 @@
         <e p="Verb_Deflected.cs" t="Include" />
       </e>
       <e p="AllModdingComponents\CompDelayedSpawner" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompDelayedSpawner.cs" t="Include" />
         <e p="CompDelayedSpawner.csproj" t="IncludeRecursive" />
         <e p="CompProperties_DelayedSpawner.cs" t="Include" />
@@ -141,6 +147,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompExtraSounds" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompExtraSounds.cs" t="Include" />
         <e p="CompExtraSounds.csproj" t="IncludeRecursive" />
         <e p="CompProperties_ExtraSounds.cs" t="Include" />
@@ -151,6 +158,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompInstalledPart" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompInstalledPart.cs" t="Include" />
         <e p="CompInstalledPart.csproj" t="IncludeRecursive" />
         <e p="CompProperties_InstalledPart.cs" t="Include" />
@@ -164,6 +172,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompLumbering" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompLumbering.cs" t="Include" />
         <e p="CompLumbering.csproj" t="IncludeRecursive" />
         <e p="CompProperties_Lumbering.cs" t="Include" />
@@ -173,6 +182,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompOverlays" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompOverlays.cs" t="Include" />
         <e p="CompOverlays.csproj" t="IncludeRecursive" />
         <e p="CompProperties_Overlays.cs" t="Include" />
@@ -182,6 +192,7 @@
         </e>
       </e>
       <e p="AllModdingComponents\CompOversizedWeapon" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompOversizedWeapon.cs" t="Include" />
         <e p="CompOversizedWeapon.csproj" t="IncludeRecursive" />
         <e p="CompProperties_OversizedWeapon.cs" t="Include" />
@@ -213,6 +224,7 @@
         <e p="StringOf.cs" t="Include" />
       </e>
       <e p="AllModdingComponents\CompToggleDef" t="IncludeRecursive">
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CompProperties_ToggleDef.cs" t="Include" />
         <e p="CompToggleDef.cs" t="Include" />
         <e p="CompToggleDef.csproj" t="IncludeRecursive" />
@@ -226,6 +238,7 @@
       <e p="AllModdingComponents\CompVehicle" t="IncludeRecursive">
         <e p="AbandonedVehicleContentsComp.cs" t="Include" />
         <e p="Bill_LoadVehicle.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Command_VehicleHandler.cs" t="Include" />
         <e p="CompProperties_Vehicle.cs" t="Include" />
         <e p="CompProperties_VehicleSpawner.cs" t="Include" />
@@ -259,6 +272,7 @@
       <e p="AllModdingComponents\JecsTools" t="IncludeRecursive">
         <e p="_HumanlikeOrdersUtility.cs" t="Include" />
         <e p="ApparelExtension.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CaravanJobs" t="Include">
           <e p="Caravan_JobTracker.cs" t="Include" />
           <e p="CaravanJob.cs" t="Include" />
@@ -356,11 +370,11 @@
           <e p="StatWorker_Shield.cs" t="Include" />
         </e>
       </e>
+      <e p="Assemblies" t="ExcludeRecursive" />
       <e p="JecsTools.sln" t="IncludeFlat" />
       <e p="packages" t="ExcludeRecursive" />
     </e>
-    <e p="C:\Users\mattw\.Rider2018.2\config\extensions" t="IncludeRecursive" />
-    <e p="C:\Users\mattw\.Rider2018.2\system\extResources" t="IncludeRecursive" />
-    <e p="C:\Users\mattw\.Rider2018.2\system\resharper-host\local\Transient\ReSharperHost\v182\SolutionCaches\_JecsTools.-286400281.00" t="ExcludeRecursive" />
+    <e p="H:\SteamSSD\steamapps\common\RimWorld\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\LotRDev\Assemblies" t="ExcludeRecursive" />
+    <e p="H:\SteamSSD\steamapps\common\RimWorld\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\ShieldsCore\Assemblies" t="ExcludeRecursive" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Source/.idea/.idea.JecsTools/.idea/indexLayout.xml b/Source/.idea/.idea.JecsTools/.idea/indexLayout.xml
index 27ba142e..f1feadf0 100644
--- a/Source/.idea/.idea.JecsTools/.idea/indexLayout.xml
+++ b/Source/.idea/.idea.JecsTools/.idea/indexLayout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelUserStore">
-    <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
   </component>
diff --git a/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs b/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs
index 28ec90e8..9a041b0b 100644
--- a/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs
+++ b/Source/AllModdingComponents/CompAbilityUser/Controller/JobDriver_CastAbilityVerb.cs
@@ -20,7 +20,8 @@ protected override IEnumerable<Toil> MakeNewToils()
             yield return Toils_Misc.ThrowColonistAttackingMote(TargetIndex.A);
             if (TargetA.HasThing)
             {
-                if (!GetActor().IsFighting() || !Verb.UseAbilityProps.canCastInMelee)
+	            // !GetActor().IsFighting() || - removed from below "If" by xen for melee casting fix
+                if (!Verb.UseAbilityProps.canCastInMelee)
                 {
                     var getInRangeToil = Toils_Combat.GotoCastPosition(TargetIndex.A, false);
                     yield return getInRangeToil;
diff --git a/Source/AllModdingComponents/CompAbilityUser/bin/Release/AbilityUser.dll b/Source/AllModdingComponents/CompAbilityUser/bin/Release/AbilityUser.dll
index 159230bb..ba7276e1 100644
Binary files a/Source/AllModdingComponents/CompAbilityUser/bin/Release/AbilityUser.dll and b/Source/AllModdingComponents/CompAbilityUser/bin/Release/AbilityUser.dll differ
diff --git a/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompActivatableEffect.dll b/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompActivatableEffect.dll
index a73c2bf3..9f55b955 100644
Binary files a/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompActivatableEffect.dll and b/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompActivatableEffect.dll differ
diff --git a/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompOversizedWeapon.dll b/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompOversizedWeapon.dll
index 7d9bc807..1d7441c9 100644
Binary files a/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompOversizedWeapon.dll and b/Source/AllModdingComponents/CompActivatableEffect/bin/Release/CompOversizedWeapon.dll differ
diff --git a/Source/AllModdingComponents/CompAnimated/bin/Release/CompAnimated.dll b/Source/AllModdingComponents/CompAnimated/bin/Release/CompAnimated.dll
index 715b889f..fc074e7f 100644
Binary files a/Source/AllModdingComponents/CompAnimated/bin/Release/CompAnimated.dll and b/Source/AllModdingComponents/CompAnimated/bin/Release/CompAnimated.dll differ
diff --git a/Source/AllModdingComponents/CompBalloon/bin/Release/CompBalloon.dll b/Source/AllModdingComponents/CompBalloon/bin/Release/CompBalloon.dll
index 8f11d778..2c5f69d4 100644
Binary files a/Source/AllModdingComponents/CompBalloon/bin/Release/CompBalloon.dll and b/Source/AllModdingComponents/CompBalloon/bin/Release/CompBalloon.dll differ
diff --git a/Source/AllModdingComponents/CompDeflector/CompDeflector.cs b/Source/AllModdingComponents/CompDeflector/CompDeflector.cs
index a25aac5c..69b06f2e 100644
--- a/Source/AllModdingComponents/CompDeflector/CompDeflector.cs
+++ b/Source/AllModdingComponents/CompDeflector/CompDeflector.cs
@@ -187,7 +187,7 @@ public virtual Verb ReflectionHandler(Verb newVerb)
             if (Props.canReflect)
             {
                 lastAccuracyRoll = ReflectionAccuracy();
-                var deflectVerb = newVerb;
+                var deflectVerbX = newVerb;
 
                 //Initialize VerbProperties
                 var newVerbProps = new VerbProperties
@@ -237,8 +237,8 @@ public virtual Verb ReflectionHandler(Verb newVerb)
                         break;
                 }
                 //Apply values
-                deflectVerb.verbProps = newVerbProps;
-                return deflectVerb;
+                deflectVerbX.verbProps = newVerbProps;
+                return deflectVerbX;
             }
             return newVerb;
         }
diff --git a/Source/AllModdingComponents/CompDeflector/bin/Release/CompDeflector.dll b/Source/AllModdingComponents/CompDeflector/bin/Release/CompDeflector.dll
index 855381df..6693d60c 100644
Binary files a/Source/AllModdingComponents/CompDeflector/bin/Release/CompDeflector.dll and b/Source/AllModdingComponents/CompDeflector/bin/Release/CompDeflector.dll differ
diff --git a/Source/AllModdingComponents/CompDelayedSpawner/bin/Release/CompDelayedSpawner.dll b/Source/AllModdingComponents/CompDelayedSpawner/bin/Release/CompDelayedSpawner.dll
index 378b8700..61aa05e6 100644
Binary files a/Source/AllModdingComponents/CompDelayedSpawner/bin/Release/CompDelayedSpawner.dll and b/Source/AllModdingComponents/CompDelayedSpawner/bin/Release/CompDelayedSpawner.dll differ
diff --git a/Source/AllModdingComponents/CompExtraSounds/bin/Release/CompExtraSounds.dll b/Source/AllModdingComponents/CompExtraSounds/bin/Release/CompExtraSounds.dll
index 70d7428b..7bfef379 100644
Binary files a/Source/AllModdingComponents/CompExtraSounds/bin/Release/CompExtraSounds.dll and b/Source/AllModdingComponents/CompExtraSounds/bin/Release/CompExtraSounds.dll differ
diff --git a/Source/AllModdingComponents/CompInstalledPart/bin/Release/CompInstalledPart.dll b/Source/AllModdingComponents/CompInstalledPart/bin/Release/CompInstalledPart.dll
index 7e20c7ab..505f8663 100644
Binary files a/Source/AllModdingComponents/CompInstalledPart/bin/Release/CompInstalledPart.dll and b/Source/AllModdingComponents/CompInstalledPart/bin/Release/CompInstalledPart.dll differ
diff --git a/Source/AllModdingComponents/CompLumbering/bin/Release/CompLumbering.dll b/Source/AllModdingComponents/CompLumbering/bin/Release/CompLumbering.dll
index 06b099e8..73e9e351 100644
Binary files a/Source/AllModdingComponents/CompLumbering/bin/Release/CompLumbering.dll and b/Source/AllModdingComponents/CompLumbering/bin/Release/CompLumbering.dll differ
diff --git a/Source/AllModdingComponents/CompOverlays/bin/Release/CompOverlays.dll b/Source/AllModdingComponents/CompOverlays/bin/Release/CompOverlays.dll
index 3506d473..b5acd9bb 100644
Binary files a/Source/AllModdingComponents/CompOverlays/bin/Release/CompOverlays.dll and b/Source/AllModdingComponents/CompOverlays/bin/Release/CompOverlays.dll differ
diff --git a/Source/AllModdingComponents/CompOversizedWeapon/bin/Release/CompOversizedWeapon.dll b/Source/AllModdingComponents/CompOversizedWeapon/bin/Release/CompOversizedWeapon.dll
index 7d9bc807..1d7441c9 100644
Binary files a/Source/AllModdingComponents/CompOversizedWeapon/bin/Release/CompOversizedWeapon.dll and b/Source/AllModdingComponents/CompOversizedWeapon/bin/Release/CompOversizedWeapon.dll differ
diff --git a/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.dll b/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.dll
index 29854622..f5b603c6 100644
Binary files a/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.dll and b/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.dll differ
diff --git a/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.pdb b/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.pdb
index 7dfa4048..f19b5dd4 100644
Binary files a/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.pdb and b/Source/AllModdingComponents/CompToggleDef/bin/Release/CompToggleDef.pdb differ
diff --git a/Source/AllModdingComponents/CompVehicle/bin/Release/CompVehicle.dll b/Source/AllModdingComponents/CompVehicle/bin/Release/CompVehicle.dll
index e9b5ebd6..462c7f22 100644
Binary files a/Source/AllModdingComponents/CompVehicle/bin/Release/CompVehicle.dll and b/Source/AllModdingComponents/CompVehicle/bin/Release/CompVehicle.dll differ
diff --git a/Source/AllModdingComponents/JecsTools/bin/Release/0JecsTools.dll b/Source/AllModdingComponents/JecsTools/bin/Release/0JecsTools.dll
index 04037b3b..384cdea3 100644
Binary files a/Source/AllModdingComponents/JecsTools/bin/Release/0JecsTools.dll and b/Source/AllModdingComponents/JecsTools/bin/Release/0JecsTools.dll differ
diff --git a/Source/Assemblies/CompSlotLoadable.dll b/Source/Assemblies/CompSlotLoadable.dll
index 840b6309..3a15d751 100644
Binary files a/Source/Assemblies/CompSlotLoadable.dll and b/Source/Assemblies/CompSlotLoadable.dll differ