diff --git a/Firespitter/Firespitter.csproj b/Firespitter/Firespitter.csproj
index b7794dd4..fb31b994 100644
--- a/Firespitter/Firespitter.csproj
+++ b/Firespitter/Firespitter.csproj
@@ -35,11 +35,11 @@
   <ItemGroup>
     <Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Spill\ksp_win\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Spill\ksp_win\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49,7 +49,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Spill\ksp_win\KSP_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -151,7 +151,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy Firespitter.dll D:\Spill\KSP_win\GameData\Firespitter\Plugins</PostBuildEvent>
+    <PostBuildEvent>copy Firespitter.dll D:\KSP_DEV\GameData\Firespitter\Plugins</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Firespitter/aero/FSliftSurface.cs b/Firespitter/aero/FSliftSurface.cs
index 6712e444..60d557a3 100644
--- a/Firespitter/aero/FSliftSurface.cs
+++ b/Firespitter/aero/FSliftSurface.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using UnityEngine;
 
-class FSliftSurface : PartModule
+class FSliftSurface : PartModule, ILiftProvider
 {
     [KSPField]
     public string liftTransformName = "lift";
diff --git a/For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg b/For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg
index 316289d3..83cfd859 100644
--- a/For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg	
+++ b/For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg	
@@ -3,7 +3,7 @@ PART
 
 // --- general parameters ---
 name = FSbomberWing
-module = ControlSurface
+module = Part //ControlSurface
 author = Snjo
 
 // --- asset parameters ---
@@ -43,17 +43,28 @@ breakingTorque = 200
 
 // --- winglet parameters ---
 // dragCoeff will override the maximum_drag value
-dragCoeff = 0.6
-deflectionLiftCoeff = 2.1 // WAS 1.9
-ctrlSurfaceRange = 15 //was 10
-ctrlSurfaceArea = 0.4 //was 0.5
+//dragCoeff = 0.6
+//deflectionLiftCoeff = 2.1 // WAS 1.9
+//ctrlSurfaceRange = 15 //was 10
+//ctrlSurfaceArea = 0.4 //was 0.5
 
-MODULE
-{
- name = FSwingletRangeAdjustment
- stepAngle = 5
- maxRange = 60
-}
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.6
+		deflectionLiftCoeff = 2.1
+		ctrlSurfaceRange = 15
+		ctrlSurfaceArea = 0.4
+	}
+
+
+//MODULE
+//{
+// name = FSwingletRangeAdjustment
+// stepAngle = 5
+// maxRange = 60
+//}
 
 //RESOURCE
 //{
diff --git a/For release/Firespitter/Parts/Aero/FS_bomberWingExtender/part.cfg b/For release/Firespitter/Parts/Aero/FS_bomberWingExtender/part.cfg
index 91bda88c..efcb41ab 100644
--- a/For release/Firespitter/Parts/Aero/FS_bomberWingExtender/part.cfg	
+++ b/For release/Firespitter/Parts/Aero/FS_bomberWingExtender/part.cfg	
@@ -3,7 +3,7 @@ PART
 
 // --- general parameters ---
 name = FSbomberWingExtender
-module = Winglet
+module = Part //Winglet
 author = Snjo
 
 // --- asset parameters ---
@@ -40,14 +40,20 @@ explosionPotential = 0.1
 fuelCrossFeed = True
 // --- winglet parameters ---
 // dragCoeff will override the maximum_drag value
-dragCoeff = 0.6
-deflectionLiftCoeff = 1.5 // WAS 1.3
+//dragCoeff = 0.6
+//deflectionLiftCoeff = 1.5 // WAS 1.3
 breakingForce = 200
 breakingTorque = 200
 
 // --- tweakables (coming soon...) ---
 
-
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.6
+		deflectionLiftCoeff = 1.5
+	}
 
 
 // ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec -----
diff --git a/For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg b/For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg
index 5c577aa8..41cc1f8c 100644
--- a/For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg	
+++ b/For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg	
@@ -1,20 +1,8 @@
 PART
 {
-
-// this is a sample config file, for determining a good file format for defining part parameters
-// comment line - ignored by cfg parser
-// empty lines, or lines without a '=' sign are also ignored
-// all other lines are split at the '=' sign, and the left operand is used to know what parameter we are setting
-// diferent parameters require data in different formats (see docs), and each module has it's own parameters (again, see docs)
-// each assignment must be in a single line. Lines without assignments will be ignored. (You CAN turn on word wrap, though)
-// each keyword here relates to an existing variable in the assigned module. If the keyword isn't found, it is ignored.
-// conversely, if a keyword is left unassigned (as in not in the file), it will be initialized with it's default value
-// This is done automatically, so any public variable defined in the loaded module can be accessed this way (provided it's value can be parsed)
-
-
 // --- general parameters ---
 name = FSfighterWing
-module = ControlSurface
+module = Part //ControlSurface
 author = Snjo
 
 // --- asset parameters ---
@@ -42,7 +30,7 @@ node_attach = -1.5, 0.0, 0.0, -1.0, 0.0, 0.0
 
 // --- standard part parameters ---
 mass = 0.05
-dragModelType = override
+dragModelType = none //override
 maximum_drag = 0.02
 minimum_drag = 0.02
 angularDrag = 2
@@ -52,13 +40,25 @@ breakingTorque = 200
 maxTemp = 3400
 explosionPotential = 0.1
 fuelCrossFeed = True
+bulkheadProfiles = srf
 
 // --- winglet parameters ---
 // dragCoeff will override the maximum_drag value
-dragCoeff = 0.5
-deflectionLiftCoeff = 1.0 //was 0.8
-ctrlSurfaceRange = 20
-ctrlSurfaceArea = 0.2
+//dragCoeff = 0.5
+//deflectionLiftCoeff = 1.0 //was 0.8
+//ctrlSurfaceRange = 20
+//ctrlSurfaceArea = 0.2
+
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.5
+		deflectionLiftCoeff = 1.0
+		ctrlSurfaceRange = 20
+		ctrlSurfaceArea = 0.2
+	}
+
 
 RESOURCE
 {
@@ -67,12 +67,12 @@ RESOURCE
  maxAmount = 30
 }
 
-MODULE
-{
- name = FSwingletRangeAdjustment
- stepAngle = 5
- maxRange = 60
-}
+//MODULE
+//{
+// name = FSwingletRangeAdjustment
+// stepAngle = 5
+// maxRange = 60
+//}
 
 // ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----
 
diff --git a/For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg b/For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg
index 9f132c16..1f161133 100644
--- a/For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg	
+++ b/For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg	
@@ -3,7 +3,7 @@ PART
 
 // --- general parameters ---
 name = FStailWing
-module = ControlSurface
+module = Part //ControlSurface
 author = Snjo
 
 // --- asset parameters ---
@@ -42,17 +42,28 @@ explosionPotential = 0.1
 
 // --- winglet parameters ---
 // dragCoeff will override the maximum_drag value
-dragCoeff = 0.6
-deflectionLiftCoeff = 0.2
-ctrlSurfaceRange = 15
-ctrlSurfaceArea = 0.4
+//dragCoeff = 0.6
+//deflectionLiftCoeff = 0.2
+//ctrlSurfaceRange = 15
+//ctrlSurfaceArea = 0.4
 
-MODULE
-{
- name = FSwingletRangeAdjustment
- stepAngle = 5
- maxRange = 60
-}
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.6
+		deflectionLiftCoeff = 0.2
+		ctrlSurfaceRange = 15
+		ctrlSurfaceArea = 0.4
+	}
+
+
+//MODULE
+//{
+// name = FSwingletRangeAdjustment
+// stepAngle = 5
+// maxRange = 60
+//}
 
 // ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----
 
diff --git a/For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg b/For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg
index fff2aa88..535e6bd1 100644
--- a/For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg	
+++ b/For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg	
@@ -3,7 +3,7 @@ PART
 
 // --- general parameters ---
 name = FStailWingLarge
-module = ControlSurface
+module = Part //ControlSurface
 author = Snjo
 
 // --- asset parameters ---
@@ -42,17 +42,27 @@ explosionPotential = 0.1
 
 // --- winglet parameters ---
 // dragCoeff will override the maximum_drag value
-dragCoeff = 0.6
-deflectionLiftCoeff = 0.3
-ctrlSurfaceRange = 15
-ctrlSurfaceArea = 0.7
+//dragCoeff = 0.6
+//deflectionLiftCoeff = 0.3
+//ctrlSurfaceRange = 15
+//ctrlSurfaceArea = 0.7
 
-MODULE
-{
- name = FSwingletRangeAdjustment
- stepAngle = 5
- maxRange = 60
-}
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.6
+		deflectionLiftCoeff = 0.3
+		ctrlSurfaceRange = 15
+		ctrlSurfaceArea = 0.7
+	}
+
+//MODULE
+//{
+// name = FSwingletRangeAdjustment
+// stepAngle = 5
+// maxRange = 60
+//}
 
 // ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----
 
diff --git a/For release/Firespitter/Parts/Aero/FS_winglet/part.cfg b/For release/Firespitter/Parts/Aero/FS_winglet/part.cfg
index f52799e2..4733a115 100644
--- a/For release/Firespitter/Parts/Aero/FS_winglet/part.cfg	
+++ b/For release/Firespitter/Parts/Aero/FS_winglet/part.cfg	
@@ -3,7 +3,7 @@ PART
 
 // --- general parameters ---
 name = FSwinglet
-module = ControlSurface
+module = Part //ControlSurface
 author = Snjo
 
 // --- asset parameters ---
@@ -40,17 +40,28 @@ explosionPotential = 0.1
 
 // --- winglet parameters ---
 // dragCoeff will override the maximum_drag value
-dragCoeff = 0.6
-deflectionLiftCoeff = 0.2
-ctrlSurfaceRange = 10
-ctrlSurfaceArea = 0.4
+//dragCoeff = 0.6
+//deflectionLiftCoeff = 0.2
+//ctrlSurfaceRange = 10
+//ctrlSurfaceArea = 0.4
 
-MODULE
-{
- name = FSwingletRangeAdjustment
- stepAngle = 5
- maxRange = 60
-}
+	MODULE
+	{
+		name = ModuleControlSurface
+		useInternalDragModel = True
+		dragCoeff = 0.6
+		deflectionLiftCoeff = 0.2
+		ctrlSurfaceRange = 10
+		ctrlSurfaceArea = 0.4
+	}
+
+
+//MODULE
+//{
+// name = FSwingletRangeAdjustment
+// stepAngle = 5
+// maxRange = 60
+//}
 
 // ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----
 
diff --git a/For release/Firespitter/Parts/Wheel/FS_fighterLandingGear/part.cfg b/For release/Firespitter/Parts/Wheel/FS_fighterLandingGear/part.cfg
index 00e1d3e9..fb27ce84 100644
--- a/For release/Firespitter/Parts/Wheel/FS_fighterLandingGear/part.cfg	
+++ b/For release/Firespitter/Parts/Wheel/FS_fighterLandingGear/part.cfg	
@@ -13,7 +13,7 @@ scale = 1.0
 
 // --- node definitions ---
 
-node_attach = 0.00, 0.00, 0.00, 0.0, 1.0, 0.0, 1
+node_attach = 0.00, 0.00, 0.00, 1.0, 0.0, 0.0, 1
 
 // --- FX definitions ---
 
diff --git a/For release/Firespitter/Plugins/Firespitter.dll b/For release/Firespitter/Plugins/Firespitter.dll
index ad8fdd9c..4b973673 100644
Binary files a/For release/Firespitter/Plugins/Firespitter.dll and b/For release/Firespitter/Plugins/Firespitter.dll differ
diff --git a/For release/PartCatalog/Plugins/PluginData/PartCatalog/Firespitter_Off.png b/For release/PartCatalog/Plugins/PluginData/PartCatalog/Firespitter_Off.png
deleted file mode 100644
index e03b6a8b..00000000
Binary files a/For release/PartCatalog/Plugins/PluginData/PartCatalog/Firespitter_Off.png and /dev/null differ
diff --git a/For release/PartCatalog/Plugins/PluginData/PartCatalog/Firespitter_On.png b/For release/PartCatalog/Plugins/PluginData/PartCatalog/Firespitter_On.png
deleted file mode 100644
index 242cb457..00000000
Binary files a/For release/PartCatalog/Plugins/PluginData/PartCatalog/Firespitter_On.png and /dev/null differ