diff --git a/LICENSE.md b/LICENSE.md
index 196bd20d..4fd6c662 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,26 +1,19 @@
 **Copyright Overview**
 
-* Models and textures of connector, ports, winches and magnet parts was created by Winn75, who retains the copyright.
-* Models and textures of containers, bays, strut, pipe and pylon was created by zzz, who retains the copyright.
-* Models for all remaining parts were created by KospY, who retains the copyrights.
-* Config files, shaders, source code and compiled binaries are under copyright retained by KospY.
+- Models and textures of connector, ports, winches and magnet parts was created by Winn75, who retains the copyright.
+- Models and textures of containers, bays, strut, pipe and pylon was created by zzz, who retains the copyright.
+- Models for all remaining parts were created by KospY, who retains the copyrights.
+- Config files, shaders, source code and compiled binaries are under copyright retained by KospY.
+ 
 
-**YOU MAY**:
-- Distribute your own parts using the following part modules:
-    - `KASModuleGrab`
-    - `KASModuleContainer`
-    - `KASModulePartBay`
-    - `KASModulePort`
+**YOU MAY :**
+
+- Distribute your own parts using any part modules included in KAS.
+- Distribute fixes in case of a compatibility problem with a new version of KSP (.dll only).
 - Distribute video, screenshots or other media portraying unmodified versions of KAS in action.
-- Distribute modified or unmodified versions of the KAS plugin source code on condition that a link to this license is included.
+- Distribute modified or unmodified versions of the KAS plugin source code on condition that a link to this license is - included.
 - Modify KAS in any way for personal use.
 - Request a waiver of any of these terms.
+ 
 
-**All other rights are reserved.** In particular, **YOU MAY NOT**:
-- Distribute unmodified versions of KAS, in part or whole.
-- Distribute modified versions of KAS, in part or whole, including the packaged models, textures, plugins, part configurations and any other component, with exception of plugin source code.
-- Use models, animations, textures or other assets from KAS, including by reference.
-- Use components of the KAS plugin, including parts and part modules, except where explicitly allowed.
-- Distribute a byte patch or other difference file or patcher intended to modify KAS files without directly distributing them.
-- Use any part of the KAS source or package, or other KAS branding, for any commercial purpose.
-- Relicense any part of KAS.
+**All other rights are reserved.**
diff --git a/MM_Science.cfg b/MM_Science.cfg
new file mode 100644
index 00000000..b39df588
--- /dev/null
+++ b/MM_Science.cfg
@@ -0,0 +1,15 @@
+@PART[*]:HAS[@MODULE[KASModuleGrab],@MODULE[ModuleScienceExperiment]]:FOR[KAS]
+{
+    @MODULE[KASModuleGrab]:HAS[#storable[true]]
+    {
+        %stateless = false
+    }
+}
+
+@PART[*]:HAS[@MODULE[KASModuleGrab],@MODULE[ModuleScienceContainer]]:FOR[KAS]
+{
+    @MODULE[KASModuleGrab]:HAS[#storable[true]]
+    {
+        %stateless = false
+    }
+}
diff --git a/MM_Squad.cfg b/MM_Squad.cfg
new file mode 100644
index 00000000..121f45ea
--- /dev/null
+++ b/MM_Squad.cfg
@@ -0,0 +1,489 @@
+@PART[KAS_ContainerBay1]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.40, -0.10)
+        evaPartDir = (0,0,-1)
+        attachNodeName = bottom
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = True
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[linearRcs]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.21)
+        evaPartDir = (0,0,-1)
+        dropAtGroundPos = false
+        dropPartPos = (0.0, -0.1, -0.65)
+        dropPartRot = (0.0, 90.0, 0.0)
+        addPartMass = true
+        storable = true
+        storedSize = 4
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[RCSBlock]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.18)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 6
+        attachOnPart = True
+        attachOnEva = True
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[roverWheel2]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.48, -0.14)
+        evaPartDir = (0,-0.3,-1)
+        storable = true
+        storedSize = 30
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[batteryPack]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.15)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[spotLight1]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.15)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 8
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[spotLight2]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.15)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 8
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[ladder1]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, -0.03, -0.1)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[telescopicLadder]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, -0.07, -0.34)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 25
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[telescopicLadderBay]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, -0.07, -0.34)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 30
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[solarPanels1]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.22)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[solarPanels2]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.22)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[solarPanels3]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.22)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[solarPanels4]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.22)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[solarPanels5]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.12, -0.14)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False}
+}
+
+@PART[rtg]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.10)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 20
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[seatExternalCmd]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.15)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 20
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[smallRadialEngine]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.12, -0.14)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 15
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[radialEngineMini]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.15)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[radialRCSTank]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.29)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 30
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[xenonTankRadial]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.15)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 25
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[strutCube]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.11)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[sensorAccelerometer]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.12)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[sensorBarometer]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.12)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[sensorGravimeter]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.12)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[sensorThermometer]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.12)
+        evaPartDir = (0,0,-1)
+        storable = true
+        stateless = false
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[commDish]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.35)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 10
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[mediumDishAntenna]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.15, -0.18)
+        evaPartDir = (0,-0.15,-1)
+        storable = true
+        storedSize = 8
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[longAntenna]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.00, -0.09)
+        evaPartDir = (0,0,-1)
+        storable = true
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
+
+@PART[parachuteRadial]:FOR[KAS]
+{
+    MODULE
+    {
+        name = KASModuleGrab
+        evaPartPos = (0.0, 0.09, -0.23)
+        evaPartDir = (0,0,-1)
+        physicJoint = true
+        storable = true
+        storedSize = 5
+        attachOnPart = True
+        attachOnEva = False
+        attachOnStatic = False
+        attachSendMsgOnly = False
+    }
+}
\ No newline at end of file
diff --git a/Parts/cPort1/cPort1.cfg b/Parts/cPort1/cPort1.cfg
index e689034f..6eb8a759 100644
--- a/Parts/cPort1/cPort1.cfg
+++ b/Parts/cPort1/cPort1.cfg
@@ -16,7 +16,7 @@ node_stack_top = 0.0, 0.0362, 0.0, 0.0, 1.0, 0.0, 0
 node_stack_bottom = 0.0, -0.0400, 0.0, 0.0, 1.0, 0.0, 0
 node_attach = 0.0, -0.04, 0.0, 0.0, -1.0, 0.0
 
-cost = 200
+cost = 350
 category = Utility
 subcategory = 0
 title = Radial connector port
diff --git a/Parts/cPort2/cPort2.cfg b/Parts/cPort2/cPort2.cfg
index 5f82dc0a..5d67c886 100644
--- a/Parts/cPort2/cPort2.cfg
+++ b/Parts/cPort2/cPort2.cfg
@@ -15,7 +15,7 @@ mesh = portStack1.mu
 node_stack_top = 0.0, 0.00082, 0.0, 0.0, 1.0, 0.0, 0
 node_stack_bottom = 0.0, -0.0424, 0.0, 0.0, 1.0, 0.0, 0
 
-cost = 200
+cost = 450
 category = Utility
 subcategory = 0
 title = Stack connector port (0.5m)
diff --git a/Parts/container1/container1.cfg b/Parts/container1/container1.cfg
index 7bcbebd3..5bb73697 100644
--- a/Parts/container1/container1.cfg
+++ b/Parts/container1/container1.cfg
@@ -18,7 +18,7 @@ rescaleFactor = 0.50
 node_stack_bottom = 0.0, -0.3968, 0.0, 0.0, 1.0, 0.0, 0
 	
 // --- editor parameters ---
-cost = 680
+cost = 550
 category = Utility
 subcategory = 0
 title = Container Type A
diff --git a/Parts/container2/container2.cfg b/Parts/container2/container2.cfg
index 5d44b509..a8d01457 100644
--- a/Parts/container2/container2.cfg
+++ b/Parts/container2/container2.cfg
@@ -18,7 +18,7 @@ rescaleFactor = 0.50
 node_stack_bottom = 0.0, -0.7596, 0.0, 0.0, 1.0, 0.0, 0
 	
 // --- editor parameters ---
-cost = 680
+cost = 700
 category = Utility
 subcategory = 0
 title = Container Type B
diff --git a/Parts/hookSupport/hookSupport.cfg b/Parts/hookSupport/hookSupport.cfg
index 134b9ec1..e4c578a2 100644
--- a/Parts/hookSupport/hookSupport.cfg
+++ b/Parts/hookSupport/hookSupport.cfg
@@ -15,7 +15,7 @@ mesh = hookSupport.mu
 node_stack_top = 0.0, 0.0264, 0, 0.0, 1.0, 0.0, 0
 node_stack_bottom = 0.0, -0.1493, 0, 0.0, 1.0, 0.0, 0
 
-cost = 200
+cost = 150
 category = Utility
 subcategory = 0
 title = Hook Support
diff --git a/Parts/hook_anchor/anchor.cfg b/Parts/hook_anchor/anchor.cfg
index 077f60bb..3fc678ca 100644
--- a/Parts/hook_anchor/anchor.cfg
+++ b/Parts/hook_anchor/anchor.cfg
@@ -15,7 +15,7 @@ mesh = anchor.mu
 
 node_stack_top = -0.0, 0.05606, -0.0, 0.0, 1.0, 0.0, 0
 
-cost = 200
+cost = 250
 category = Utility
 subcategory = 0
 title = Anchor
diff --git a/Parts/hook_grapplingHook/grapplingHook.cfg b/Parts/hook_grapplingHook/grapplingHook.cfg
index 14e7de15..3ce9e7ea 100644
--- a/Parts/hook_grapplingHook/grapplingHook.cfg
+++ b/Parts/hook_grapplingHook/grapplingHook.cfg
@@ -16,7 +16,7 @@ scale = 1
 node_stack_top = -0.0, 0.05606, -0.0, 0.0, 1.0, 0.0, 0
 node_attach = 0.0, -0.0651, 0.0, 0.0, -1.0, 0.0
 
-cost = 500
+cost = 700
 category = Utility
 subcategory = 0
 title = Grappling hook
diff --git a/Parts/hook_magnet/magnet.cfg b/Parts/hook_magnet/magnet.cfg
index b23424ef..398805cb 100644
--- a/Parts/hook_magnet/magnet.cfg
+++ b/Parts/hook_magnet/magnet.cfg
@@ -16,7 +16,7 @@ scale = 1
 node_stack_top = -0.0, 0.1005, -0.0, 0.0, 1.0, 0.0, 0
 node_attach = 0.0, -0.0021, 0.0, 0.0, -1.0, 0.0
 
-cost = 500
+cost = 1100
 category = Utility
 subcategory = 0
 title = Electro-Magnet
diff --git a/Parts/pipe1/pipe1.cfg b/Parts/pipe1/pipe1.cfg
index bf0bda2a..ae7d4fc2 100644
--- a/Parts/pipe1/pipe1.cfg
+++ b/Parts/pipe1/pipe1.cfg
@@ -16,7 +16,7 @@ mesh = pipe1.mu
 node_stack_bottom = 0.0, -0.0578, 0.0, 0.0, 1.0, 0.0, 0
 node_attach = 0.0, -0.0578, 0.0, 0.0, -1.0, 0.0
 
-cost = 200
+cost = 250
 category = Utility
 subcategory = 0
 title = Pipe end point
diff --git a/Parts/strut1/strut1.cfg b/Parts/strut1/strut1.cfg
index 4663ace8..33194e1e 100644
--- a/Parts/strut1/strut1.cfg
+++ b/Parts/strut1/strut1.cfg
@@ -14,7 +14,7 @@ mesh = strut1.mu
 
 node_attach = 0.0, -0.0315, 0.0, 0.0, -1.0, 0.0
 
-cost = 200
+cost = 150
 category = Utility
 subcategory = 0
 title = Strut end point
diff --git a/Parts/winch1/winch1.cfg b/Parts/winch1/winch1.cfg
index 15d9dae4..6349b090 100644
--- a/Parts/winch1/winch1.cfg
+++ b/Parts/winch1/winch1.cfg
@@ -17,7 +17,7 @@ node_stack_front = -0.155, 0.00, -0.241805, 0.0, 0.0, 1.0, 0
 node_stack_top = 0.0, 0.1, 0.0, 0.0, 1.0, 0.0, 0
 node_stack_bottom = 0.0, -0.1, 0.0, 0.0, 1.0, 0.0, 0
 
-cost = 800
+cost = 350
 category = Utility
 subcategory = 0
 title = Horizontal stack winch (0.5m)
@@ -57,7 +57,7 @@ MODULE
 	evaGrabHeadDir = (0,0,1)
 	evaDropHeadPos = (0.05, 0.01, -0.16)
 	evaDropHeadRot = (180.0, 0.0, 0.0)
-	lockMinDist = 0.08
+	lockMinDist = 0.12
 	lockMinFwdDot = 0.90
 }
 
diff --git a/Parts/winch2/winch2.cfg b/Parts/winch2/winch2.cfg
index 8e899bad..b2c57f0b 100644
--- a/Parts/winch2/winch2.cfg
+++ b/Parts/winch2/winch2.cfg
@@ -17,7 +17,7 @@ node_stack_bottom = 0.0, -0.2850344, 0.0, 0.0, 1.0, 0.0, 0
 node_stack_top = 0.0, 0.1, 0.0, 0.0, 1.0, 0.0, 0
 //node_attach = 0.0, 0.1, 0.0, 0.0, 1.0, 0.0, 0
 
-cost = 800
+cost = 600
 category = Utility
 subcategory = 0
 title = Vertical stack winch (0.5m)
@@ -60,7 +60,7 @@ MODULE
 	evaDropHeadRot = (180.0, 0.0, 0.0)
 	ejectEnabled = true
 	ejectForce = 20
-	lockMinDist = 0.08
+	lockMinDist = 0.12
 	lockMinFwdDot = 0.90
 }
 
diff --git a/Parts/winch3/winch3.cfg b/Parts/winch3/winch3.cfg
index eba5d293..a1c32b9b 100644
--- a/Parts/winch3/winch3.cfg
+++ b/Parts/winch3/winch3.cfg
@@ -59,7 +59,7 @@ MODULE
 	evaDropHeadRot = (180.0, 0.0, 0.0)
 	ejectEnabled = true
 	ejectForce = 20
-	lockMinDist = 0.08
+	lockMinDist = 0.12
 	lockMinFwdDot = 0.90
 }
 
diff --git a/Parts/winch4/winch4.cfg b/Parts/winch4/winch4.cfg
index b0f72c9d..eb580242 100644
--- a/Parts/winch4/winch4.cfg
+++ b/Parts/winch4/winch4.cfg
@@ -58,7 +58,7 @@ MODULE
 	evaDropHeadRot = (180.0, 0.0, 0.0)
 	ejectEnabled = true
 	ejectForce = 20
-	lockMinDist = 0.08
+	lockMinDist = 0.12
 	lockMinFwdDot = 0.90
 }
 
diff --git a/Plugin/CompatibilityChecker.cs b/Plugin/CompatibilityChecker.cs
index ccae1421..09098a00 100644
--- a/Plugin/CompatibilityChecker.cs
+++ b/Plugin/CompatibilityChecker.cs
@@ -53,8 +53,8 @@ public static bool IsCompatible()
             \*-----------------------------------------------*/
 
             const int compatibleMajor = 0;
-            const int compatibleMinor = 23;
-            const int compatibleRevision = 5;
+            const int compatibleMinor = 25;
+            const int compatibleRevision = 0;
 
             return (Versioning.version_major == compatibleMajor) && (Versioning.version_minor == compatibleMinor) && (Versioning.Revision == compatibleRevision);
 
diff --git a/Plugin/KAS.csproj b/Plugin/KAS.csproj
index e77711df..b929d0b8 100644
--- a/Plugin/KAS.csproj
+++ b/Plugin/KAS.csproj
@@ -30,10 +30,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp" />
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\..\..\Games\KSP\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="UnityEngine" />
+    <Reference Include="UnityEngine">
+      <HintPath>..\..\..\Games\KSP\KSP_Data\Managed\UnityEngine.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CompatibilityChecker.cs" />
@@ -63,9 +67,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF EXIST "D:\ServerFolders" xcopy "$(TargetPath)" "D:\ServerFolders\Softwares\SyncFolder\KSP_0.20\GameData\KAS\Plugins\" /Y
-IF EXIST "c:\games\KSP" xcopy "$(TargetPath)" "c:\games\KSP\GameData\KAS\Plugins\" /Y
-IF EXIST "D:\games\KSP" xcopy "$(TargetPath)" "D:\games\KSP\GameData\KAS\Plugins\" /Y</PostBuildEvent>
+    <PostBuildEvent>IF EXIST "D:\games\KSP" xcopy "$(TargetPath)" "D:\games\KSP\GameData\KAS\Plugins\" /Y
+IF EXIST "E:\games\KSP" xcopy "$(TargetPath)" "E:\games\KSP\GameData\KAS\Plugins\" /Y</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/Plugin/KASAddonPointer.cs b/Plugin/KASAddonPointer.cs
index d7d71e96..f3624d73 100644
--- a/Plugin/KASAddonPointer.cs
+++ b/Plugin/KASAddonPointer.cs
@@ -415,7 +415,7 @@ private static void RotatePointer(float dist)
         
         public static void ShowAttachHelpMsg()
         {
-            ScreenMessages.PostScreenMessage("Attach pointer enabled. Press " + KASAddonControlKey.rotateLeftKey + "/" + KASAddonControlKey.rotateRightKey + " to rotate and mouse click to attach. Press echap, space, mouse2 or " + KASAddonControlKey.attachKey + " to cancel.", 5, ScreenMessageStyle.UPPER_CENTER);
+            ScreenMessages.PostScreenMessage("Attach pointer enabled. Press " + KASAddonControlKey.rotateLeftKey + "/" + KASAddonControlKey.rotateRightKey + " to rotate and mouse click to attach. Press escape, space, mouse2 or " + KASAddonControlKey.attachKey + " to cancel.", 5, ScreenMessageStyle.UPPER_CENTER);
         }
 
     }
diff --git a/Plugin/KASModuleAttachCore.cs b/Plugin/KASModuleAttachCore.cs
index d18ebcc3..765208a1 100644
--- a/Plugin/KASModuleAttachCore.cs
+++ b/Plugin/KASModuleAttachCore.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
+using System.Collections;
 using System.Text;
 using UnityEngine;
 
@@ -224,7 +226,38 @@ public virtual void OnPartUnpack()
         protected virtual void OnJointBreak(float breakForce)
         {
             KAS_Shared.DebugWarning("OnJointBreak(Core) A joint broken on " + part.partInfo.title + " !, force: " + breakForce);
-            Detach();
+            StartCoroutine(WaitAndCheckJoint());
+        }
+
+        private IEnumerator WaitAndCheckJoint()
+        {
+                yield return new WaitForFixedUpdate();
+                if (attachMode.StaticJoint)
+                {
+                    if (StaticAttach.fixedJoint == null)
+                    {
+                        KAS_Shared.DebugWarning("WaitAndCheckJoint(Core) Static join broken !");
+                        OnJointBreakStatic();
+                    } 
+                }
+                if (attachMode.FixedJoint)
+                {
+                    if (FixedAttach.fixedJoint == null)
+                    {
+                        KAS_Shared.DebugWarning("WaitAndCheckJoint(Core) Fixed join broken !");
+                        OnJointBreakFixed();
+                    }
+                }
+        }
+
+        public virtual void OnJointBreakStatic()
+        {
+            Detach(AttachType.StaticJoint);
+        }
+
+        public virtual void OnJointBreakFixed()
+        {
+            Detach(AttachType.FixedJoint);
         }
 
         protected virtual void OnDestroy()
@@ -328,10 +361,10 @@ public void AttachStatic(float breakForce = 10)
 
             KAS_Shared.DebugLog("JointToStatic(Base) Create fixed joint on the kinematic rigidbody");
             if (StaticAttach.fixedJoint) Destroy(StaticAttach.fixedJoint);
-            FixedJoint CurJoint = obj.AddComponent<FixedJoint>();
+            FixedJoint CurJoint = this.part.gameObject.AddComponent<FixedJoint>();
             CurJoint.breakForce = breakForce;
             CurJoint.breakTorque = breakForce;
-            CurJoint.connectedBody = this.part.rigidbody;
+            CurJoint.connectedBody = obj.rigidbody;
             StaticAttach.fixedJoint = CurJoint;
             attachMode.StaticJoint = true;
         }
@@ -455,6 +488,7 @@ private Vessel GetDominantVessel(Vessel v1, Vessel v2)
 
         public void Detach()
         {
+            //KAS_Shared.DebugLog("Detach(Base) Attach mode is Docked:" + attachMode.Docked + ",Coupled:" + attachMode.Coupled + ",FixedJoint:" + attachMode.FixedJoint + ",StaticJoint:" + attachMode.StaticJoint);
             if (attachMode.Docked) Detach(AttachType.Docked);
             if (attachMode.Coupled) Detach(AttachType.Coupled);
             if (attachMode.FixedJoint) Detach(AttachType.FixedJoint);
@@ -483,7 +517,8 @@ private void UndockVessel()
 
         public void Detach(AttachType attachType)
         {
-            KAS_Shared.DebugLog("Detach(Base) Attach type is : " + attachMode);
+            KAS_Shared.DebugLog("Detach(Base) Attach mode is Docked:" + attachMode.Docked + ",Coupled:" + attachMode.Coupled + ",FixedJoint:" + attachMode.FixedJoint + ",StaticJoint:" + attachMode.StaticJoint);
+            KAS_Shared.DebugLog("Detach(Base) Attach type is : " + attachType);
 
             // Docked
             if (attachType == AttachType.Docked)
diff --git a/Plugin/KASModuleContainer.cs b/Plugin/KASModuleContainer.cs
index f673eb48..2a721257 100644
--- a/Plugin/KASModuleContainer.cs
+++ b/Plugin/KASModuleContainer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Collections;
@@ -7,7 +7,7 @@
 
 namespace KAS
 {
-    public class KASModuleContainer : PartModule
+    public class KASModuleContainer : PartModule, IPartCostModifier
     {
         [KSPField] public float maxSize = 10f;
         [KSPField] public float maxOpenDistance = 2f;
@@ -30,6 +30,7 @@ public class PartContent
             public int totalCount { get { return pristine_count + instances.Count; } }
             public float totalSize { get { return storedSize * totalCount; } }
             public float totalMass { get { return pristine_mass * pristine_count + instance_mass; } }
+            public float totalCost { get { return pristine_cost * pristine_count + instance_cost; } }
 
             public float averageMass
             {
@@ -40,10 +41,19 @@ public float averageMass
                 }
             }
 
-            public readonly float pristine_mass;
+            public float averageCost
+            {
+                get
+                {
+                    int count = totalCount;
+                    return count > 0 ? totalCost / count : pristine_cost;
+                }
+            }
+
+            public readonly float pristine_mass, pristine_cost;
             public int pristine_count;
 
-            public float instance_mass;
+            public float instance_mass, instance_cost;
             public readonly List<ConfigNode> instances = new List<ConfigNode>();
 
             private PartContent(AvailablePart avPart, KASModuleGrab grab)
@@ -51,10 +61,12 @@ private PartContent(AvailablePart avPart, KASModuleGrab grab)
                 part = avPart;
                 grabModule = grab;
                 pristine_mass = part.partPrefab.mass;
+                pristine_cost = part.cost + part.partPrefab.GetModuleCosts();
 
                 foreach (var res in part.partPrefab.GetComponents<PartResource>())
                 {
                     pristine_mass += (float)(res.amount * res.info.density);
+                    pristine_cost += (float)(res.amount - res.maxAmount) * res.info.unitCost;
                 }
             }
 
@@ -91,7 +103,19 @@ public void Load(ConfigNode node)
                 {
                     ConfigNode nodeD = new ConfigNode();
                     node.CopyTo(nodeD);
-                    instance_mass += float.Parse(node.GetValue("kas_total_mass"));
+
+                    // Backward compatibility: compute the cost and save it
+                    if (!nodeD.HasValue("kas_total_cost"))
+                    {
+                        var snapshot = KAS_Shared.LoadProtoPartSnapshot(nodeD);
+
+                        float dry_cost, fuel_cost;
+                        float total_cost = ShipConstruction.GetPartCosts(snapshot, part, out dry_cost, out fuel_cost);
+                        nodeD.AddValue("kas_total_cost", total_cost);
+                    }
+
+                    instance_mass += float.Parse(nodeD.GetValue("kas_total_mass"));
+                    instance_cost += float.Parse(nodeD.GetValue("kas_total_cost"));
                     instances.Add(nodeD);
                 }
             }
@@ -108,6 +132,18 @@ public void Save(ConfigNode node)
                 {
                     ConfigNode nodeD = node.AddNode("CONTENT_PART");
                     inst.CopyTo(nodeD);
+
+                    // Science recovery works by retrieving all MODULE/ScienceData
+                    // subnodes from the part node, so copy all experiments from
+                    // contained parts to where it expects to find them.
+                    // This duplicates data but allows recovery to work properly.
+                    foreach (var module in inst.GetNodes("MODULE"))
+                    {
+                        foreach (var experiment in module.GetNodes("ScienceData"))
+                        {
+                            experiment.CopyTo(node.AddNode("ScienceData"));
+                        }
+                    }
                 }
             }
 
@@ -116,6 +152,8 @@ public ConfigNode PopInstance()
                 ConfigNode node = instances[0];
                 float mass = float.Parse(node.GetValue("kas_total_mass"));
                 instance_mass -= mass;
+                float cost = float.Parse(node.GetValue("kas_total_cost"));
+                instance_cost -= cost;
                 instances.RemoveAt(0);
                 return node;
             }
@@ -123,7 +161,7 @@ public ConfigNode PopInstance()
 
         public Dictionary<string, PartContent> availableContents = new Dictionary<string, PartContent>();
         public Dictionary<string, PartContent> contents = new Dictionary<string, PartContent>();
-
+        
         private KASModuleContainer exchangeContainer = null;
         public float totalSize = 0;
         private bool waitAndGrabRunning = false;
@@ -185,6 +223,10 @@ public override void OnLoad(ConfigNode node)
         {
             base.OnLoad(node);
 
+            // Do not load ScienceData nodes for this module's host part (a KAS container) as
+            // they were only stored in case the vessel was recovered. The original parts still
+            // contain the science data. (See PartContent.Save)
+
             if (node.HasNode("CONTENT") || node.HasNode("CONTENT_PART"))
             {
                 contents.Clear();
@@ -292,6 +334,8 @@ private void Add(AvailablePart avPart, int qty)
                 item.pristine_count += qty;
                 RefreshTotalSize();
             }
+
+            GameEvents.onEditorShipModified.Fire(EditorLogic.fetch.ship);
         }
 
         private void Remove(AvailablePart avPart, int qty)
@@ -301,6 +345,8 @@ private void Remove(AvailablePart avPart, int qty)
             {
                 item.pristine_count = Math.Max(0, item.pristine_count - qty);
                 RefreshTotalSize();
+
+                GameEvents.onEditorShipModified.Fire(EditorLogic.fetch.ship);
             }
             else
             {
@@ -645,6 +691,7 @@ private void GuiMainWindow(int windowID)
             GUILayout.BeginHorizontal();
             if (GUILayout.Button(new GUIContent("Close", "Close container"), guiButtonStyle, GUILayout.Width(60f)))
             {
+                this.activeEditTab = EditTab.All;
                 CloseAllGUI();
                 fxSndClose.audio.Play();
             }
@@ -741,9 +788,10 @@ private Vector2 GuiContentList(Dictionary<string,PartContent> contentsList, Show
             foreach (PartContent item in contentsList.Values)
             {
                 GUILayout.BeginHorizontal();
-                GUILayout.Label(new GUIContent("  " + item.part.title, "Name"), guiCenterStyle, GUILayout.Width(300f));
-                GUILayout.Label(new GUIContent("  " + item.storedSize.ToString("0.0"), "Size"), guiCenterStyle, GUILayout.Width(50f));
-                GUILayout.Label(new GUIContent("  " + item.averageMass.ToString("0.000"), "Mass"), guiCenterStyle, GUILayout.Width(50f));
+                GUILayout.Label(new GUIContent("  " + item.part.title, "Name"), guiCenterStyle, GUILayout.Width(280f));
+                GUILayout.Label(new GUIContent("  " + item.storedSize.ToString("0.0"), "Size"), guiCenterStyle, GUILayout.Width(40f));
+                GUILayout.Label(new GUIContent("  " + item.averageMass.ToString("0.000"), "Mass"), guiCenterStyle, GUILayout.Width(40f));
+                GUILayout.Label(new GUIContent("  " + item.averageCost.ToString("0"), "Cost"), guiCenterStyle, GUILayout.Width(40f));
                 GUILayout.Label(new GUIContent("  " + item.totalCount, "Quantity"), guiCenterStyle, GUILayout.Width(50f));
                 if (showButton == ShowButton.Add)
                 {
@@ -809,6 +857,7 @@ private Vector2 GuiContentList(Dictionary<string,PartContent> contentsList, Show
 
                 GUILayout.Label(new GUIContent("Weight : " + actionContainer.part.mass.ToString("0.000"), "Total weight of the container with contents"), guiRightWhiteStyle);
                 GUILayout.Label(new GUIContent(" | Space : " + actionContainer.totalSize.ToString("0.0") + " / " + actionContainer.maxSize.ToString("0.0"), "Space used / Max space"), guiRightWhiteStyle);
+                GUILayout.Label(new GUIContent(" | Cost : √" + actionContainer.GetModuleCost().ToString("0.00"), "Total cost of the container's contents"), guiRightWhiteStyle);
                 GUILayout.EndHorizontal();
                 GUILayout.EndVertical();
             }
@@ -828,5 +877,21 @@ public void ContextMenuOpenContainer()
                 ViewContents();
             }           
         }
+
+        #region IPartCostModifier Implementation
+
+        public float GetModuleCost()
+        {
+            float result = 0.0f;
+
+            foreach (PartContent item in contents.Values)
+            {
+                result += item.totalCost;
+            }
+
+            return result;
+        }
+
+        #endregion
     }
 }
diff --git a/Plugin/KASModuleGrab.cs b/Plugin/KASModuleGrab.cs
index 32145046..b2d51ef6 100644
--- a/Plugin/KASModuleGrab.cs
+++ b/Plugin/KASModuleGrab.cs
@@ -55,7 +55,7 @@ public class KASModuleGrab : KASModuleAttachCore
         private FixedJoint evaJoint;
         private List<Collider> keepTriggers;
         private bool grab_pending = false;
-
+        private bool syncGrab = false;
 
         public override string GetInfo()
         {
@@ -99,6 +99,29 @@ public override void OnStart(StartState state)
             KAS_Shared.createFXSound(this.part, fxSndDetach, detachSndPath, false);
             KAS_Shared.createFXSound(this.part, fxSndAttachStatic, attachStaticSndPath, false);
             RefreshContextMenu();
+
+            //Get attach node
+            if (attachNodeName == null || attachNodeName == "")
+            {
+                if (this.part.srfAttachNode == null)
+                {
+                    KAS_Shared.DebugError("Grab - surface attach node cannot be found on the part !");
+                    return;
+                }
+                KAS_Shared.AddNodeTransform(this.part, this.part.srfAttachNode);
+                partNode = this.part.srfAttachNode;
+            }
+            else
+            {
+                AttachNode an = this.part.findAttachNode(attachNodeName);
+                if (an == null)
+                {
+                    KAS_Shared.DebugError("Grab - " + attachNodeName + " node cannot be found on the part !");
+                    return;
+                }
+                KAS_Shared.AddNodeTransform(this.part, an);
+                partNode = an;
+            }
         }
 
         void OnCrewBoardVessel(GameEvents.FromToAction<Part, Part> fromToAction)
@@ -151,149 +174,130 @@ public override void OnPartUnpack()
                     Grab(this.vessel);
                     grab_pending = false;
                 }
-                else
-                {
-                    if (!physicJoint) this.part.rigidbody.isKinematic = true;
-                }
             }
         }
 
-        private bool AlignEvaPosition(Vessel kerbalEvaVessel)
+        internal bool GrabPending()
+        {
+            KAS_Shared.DebugLog("GrabPending - Preparing To Grab part :" + this.part.partInfo.name);
+            evaHolderVesselName = this.vessel.vesselName;
+            evaHolderPart = this.vessel.rootPart;
+            grabbed = grab_pending = true;
+            return true;
+        }
+
+        private void SetEvaNode(Vessel kerbalEvaVessel)
         {
             //Get eva transform
             evaCollider = KAS_Shared.GetEvaCollider(kerbalEvaVessel, evaTransformName);
-            if (!evaCollider)
-            {
-                KAS_Shared.DebugLog("Grab - " + evaTransformName + "transform not found on eva !");
-                return false;
-            }
-
-            //Get attach node
-            if (attachNodeName == null || attachNodeName == "")
-            {
-                if (this.part.srfAttachNode == null)
-                {
-                    KAS_Shared.DebugLog("Grab - surface attach node cannot be found on the part !");
-                    return false;
-                }
-                KAS_Shared.AddNodeTransform(this.part, this.part.srfAttachNode);
-                partNode = this.part.srfAttachNode;
-            }
-            else
-            {
-                AttachNode an = this.part.findAttachNode(attachNodeName);
-                if (an == null)
-                {
-                    KAS_Shared.DebugLog("Grab - " + attachNodeName + " node cannot be found on the part !");
-                    return false;
-                }
-                KAS_Shared.AddNodeTransform(this.part, an);
-                partNode = an;
-            }
-
-            //Send message to other modules
-            base.SendMessage("OnPartGrab", kerbalEvaVessel, SendMessageOptions.DontRequireReceiver);
-
-            //Drop grabbed part on eva if needed
-            KASModuleGrab tmpGrabbbedPartModule = KAS_Shared.GetGrabbedPartModule(kerbalEvaVessel);
-            if (tmpGrabbbedPartModule)
-            {
-                if (tmpGrabbbedPartModule.part.packed)
-                {
-                    KAS_Shared.DebugWarning("Grab - cannot drop an incompletely grabbed part!");
-                    return false;
-                }
-
-                KAS_Shared.DebugWarning("Grab - Drop current grabbed part");
-                tmpGrabbbedPartModule.Drop();
-            }
- 
             if (evaNodeTransform) Destroy(evaNodeTransform.gameObject);
-
             evaNodeTransform = new GameObject("KASEvaNode").transform;
             evaNodeTransform.parent = evaCollider.transform;
             evaNodeTransform.localPosition = evaPartPos;
             evaNodeTransform.rotation = KAS_Shared.DirectionToQuaternion(evaCollider.transform, evaPartDir);
+        }
 
-            KAS_Shared.MoveAlign(this.part.transform, partNode.nodeTransform, evaNodeTransform);
-
-            if (this.part.vessel == kerbalEvaVessel)
+        private void DisableColliders()
+        {
+            keepTriggers = new List<Collider>();
+            List<Collider> allColliders = new List<Collider>(this.part.GetComponentsInChildren<Collider>() as Collider[]);
+            foreach (Collider col in allColliders)
             {
-                this.part.UpdateOrgPosAndRot(kerbalEvaVessel.rootPart);
-            }
+                if (col.isTrigger)
+                {
+                    keepTriggers.Add(col);
+                }
 
-            return true;
+                col.isTrigger = true;
+            }
         }
 
-        internal bool GrabPending()
+        public void FixedUpdate()
         {
-            KAS_Shared.DebugLog("GrabPending - Preparing To Grab part :" + this.part.partInfo.name);
-
-            if (!AlignEvaPosition(this.vessel))
+            if (syncGrab)
             {
-                return false;
+                KAS_Shared.MoveAlign(this.part.transform, partNode.nodeTransform, evaNodeTransform);
+                this.part.rigidbody.velocity = FlightGlobals.ActiveVessel.rootPart.rigidbody.velocity;
             }
-
-            evaHolderVesselName = this.vessel.vesselName;
-            evaHolderPart = this.vessel.rootPart;
-            grabbed = grab_pending = true;
-
-            return true;
         }
 
         public void Grab(Vessel kerbalEvaVessel)
+        {
+            //Validation
+            KASModuleGrab grabbedPartModule = KAS_Shared.GetGrabbedPartModule(kerbalEvaVessel);
+            if (grabbedPartModule)
+            {
+                if (grabbedPartModule.part.packed)
+                {
+                    KAS_Shared.DebugWarning("Grab - cannot drop the current grabbed part ! (packed)");
+                    return;
+                }
+            }
+            //Start grab 
+            StartCoroutine(GrabCoroutine(kerbalEvaVessel));
+        }
+
+        private IEnumerator GrabCoroutine(Vessel kerbalEvaVessel)
         {
             KAS_Shared.DebugLog("Grab - Grabbing part :" + this.part.partInfo.name);
+            //Send message to other modules
+            base.SendMessage("OnPartGrab", kerbalEvaVessel, SendMessageOptions.DontRequireReceiver);
 
-            if (!AlignEvaPosition(kerbalEvaVessel))
+            //Set attach node on EVA
+            SetEvaNode(kerbalEvaVessel);
+
+            //Drop grabbed eva part if any
+            KASModuleGrab grabbbedPartModule = KAS_Shared.GetGrabbedPartModule(kerbalEvaVessel);
+            if (grabbbedPartModule)
             {
-                return;
+                grabbbedPartModule.Drop();
             }
 
-            //Grab winch connected head if any
+            //Unplug winch connected head if any
             KASModuleWinch moduleWinch = KAS_Shared.GetConnectedWinch(this.part);
             if (moduleWinch)
             {
-                KASModulePort modulePort = this.part.GetComponent<KASModulePort>();
                 moduleWinch.UnplugHead(false);
-                moduleWinch.GrabHead(kerbalEvaVessel, modulePort);
             }
 
-            keepTriggers = new List<Collider>();
-
-            List<Collider> allColliders = new List<Collider>(this.part.GetComponentsInChildren<Collider>() as Collider[]);
-            foreach (Collider col in allColliders)
-            {
-                if (col.isTrigger)
-                {
-                    keepTriggers.Add(col);
-                }
-
-                col.isTrigger = true;
-            }
+            //Disable all colliders on part
+            DisableColliders();
 
+            //Detach if needed
             Detach();
 
+            //Decouple part (if not already done, in case of loading after a save with the part grabbed)
             if (this.part.vessel != kerbalEvaVessel)
             {
                 KAS_Shared.DecoupleFromAll(this.part);
-                this.part.Couple(kerbalEvaVessel.rootPart);
             }
-            else
+
+            //Wait decouple action (x64 fix)
+            yield return new WaitForFixedUpdate();
+
+            //Move part to eva node
+            KAS_Shared.MoveAlign(this.part.transform, partNode.nodeTransform, evaNodeTransform);
+
+            //Grab winch connected head if any
+            if (moduleWinch)
             {
-                if (this.part.parent != kerbalEvaVessel.rootPart)
-                {
-                    this.part.setParent(null);
-                    this.part.setParent(kerbalEvaVessel.rootPart);
-                }
-                this.part.PromoteToPhysicalPart();
+                KASModulePort modulePort = this.part.GetComponent<KASModulePort>();
+                moduleWinch.GrabHead(kerbalEvaVessel, modulePort);
+            }
+
+            //Couple part to eva (if not already done, in case of loading after a save with the part grabbed)
+            if (this.part.vessel != kerbalEvaVessel)
+            {
+                this.part.Couple(kerbalEvaVessel.rootPart);
             }
 
             //Destroy joint to avoid buggy eva move
-            this.part.attachJoint.DestroyJoint();
-            
-            this.part.rigidbody.velocity = kerbalEvaVessel.rootPart.rigidbody.velocity;
+            if (this.part.attachJoint)
+            {
+                this.part.attachJoint.DestroyJoint();
+            }
 
+            //Set part to physic join or kinematic with parent
             if (physicJoint)
             {
                 if (evaJoint) Destroy(evaJoint);
@@ -305,12 +309,10 @@ public void Grab(Vessel kerbalEvaVessel)
             }
             else
             {
-                this.part.physicalSignificance = Part.PhysicalSignificance.NONE;
-                this.part.transform.parent = evaNodeTransform;
-                this.part.rigidbody.isKinematic = true;
+                syncGrab = true;
                 KAS_Shared.ResetCollisionEnhancer(this.part, false);
             }
-
+            
             //Add grabbed part mass to eva
             if (addPartMass && !physicJoint)
             {
@@ -318,17 +320,22 @@ public void Grab(Vessel kerbalEvaVessel)
                 kerbalEvaVessel.rootPart.mass += this.part.mass;
             }
 
+            //Add event
             GameEvents.onCrewBoardVessel.Add(new EventData<GameEvents.FromToAction<Part, Part>>.OnEvent(this.OnCrewBoardVessel));
 
+            //Set variables
             evaHolderVesselName = kerbalEvaVessel.vesselName;
             evaHolderPart = kerbalEvaVessel.rootPart;
             grabbed = true;
             grab_pending = false;
 
+            //Refresh Context Menu
             RefreshContextMenu();
 
             //Play grab sound
             fxSndGrab.audio.Play();
+
+            //Send message to other modules
             base.SendMessage("OnPartGrabbed", kerbalEvaVessel, SendMessageOptions.DontRequireReceiver);
         }
 
@@ -337,13 +344,8 @@ public void Drop(bool forAttach = false)
             if (grabbed)
             {
                 KAS_Shared.DebugLog("Drop - Dropping part :" + this.part.partInfo.name);
-                base.SendMessage("OnPartDrop", SendMessageOptions.DontRequireReceiver);
 
-                if (this.part.rigidbody)
-                {
-                    this.part.transform.parent = null;
-                    this.part.physicalSignificance = Part.PhysicalSignificance.FULL;
-                }
+                base.SendMessage("OnPartDrop", SendMessageOptions.DontRequireReceiver);
 
                 if (this.part.vessel.isEVA || grab_pending)
                 {
@@ -383,9 +385,6 @@ public void Drop(bool forAttach = false)
                 if (evaNodeTransform) Destroy(evaNodeTransform.gameObject);
                 if (evaJoint) Destroy(evaJoint);
 
-                this.part.transform.parent = null;
-                this.part.rigidbody.isKinematic = false;
-                this.part.physicalSignificance = Part.PhysicalSignificance.FULL;
                 this.part.rigidbody.velocity = evaHolderPart.rigidbody.velocity;
                 this.part.rigidbody.angularVelocity = evaHolderPart.rigidbody.angularVelocity;
 
@@ -414,6 +413,7 @@ public void Drop(bool forAttach = false)
 
                 GameEvents.onCrewBoardVessel.Remove(new EventData<GameEvents.FromToAction<Part, Part>>.OnEvent(this.OnCrewBoardVessel));
 
+                syncGrab = false;
                 keepTriggers = null;
                 evaJoint = null;
                 evaNodeTransform = null;
@@ -468,7 +468,10 @@ public void RefreshContextMenu()
         [KSPEvent(name = "ContextMenuGrab", active = true, guiActiveUnfocused = false, guiActive = false, unfocusedRange = 2f, guiName = "Grab")]
         public void ContextMenuGrab()
         {
-            Grab(FlightGlobals.ActiveVessel);          
+            if (!part.packed)
+            {
+                Grab(FlightGlobals.ActiveVessel);
+            }
         }
 
         [KSPEvent(name = "ContextMenuDrop", active = true, guiActiveUnfocused = false, guiActive = false, unfocusedRange = 2f, guiName = "Drop")]
diff --git a/Plugin/KASModuleGrapplingHook.cs b/Plugin/KASModuleGrapplingHook.cs
index 2fa254ac..9af0e279 100644
--- a/Plugin/KASModuleGrapplingHook.cs
+++ b/Plugin/KASModuleGrapplingHook.cs
@@ -59,6 +59,11 @@ public override void OnStart(StartState state)
             KAS_Shared.createFXSound(this.part, fxSndDetach, detachSndPath, false);
         }
 
+        public override void OnJointBreakStatic()
+        {
+            DetachGrapple();
+        }
+
         public override void OnPartUnpack()
         {
             base.OnPartUnpack();
diff --git a/Plugin/KASModuleMagnet.cs b/Plugin/KASModuleMagnet.cs
index d55cd74b..7c3ecdb6 100644
--- a/Plugin/KASModuleMagnet.cs
+++ b/Plugin/KASModuleMagnet.cs
@@ -87,12 +87,11 @@ public override void OnUpdate()
             UpdateMagnet();
         }
 
-        protected override void OnJointBreak(float breakForce)
+        public override void OnJointBreakFixed()
         {
-            base.OnJointBreak(breakForce);
-            KAS_Shared.DebugWarning("A joint broken on " + part.partInfo.title + " !, force: " + breakForce);
             KAS_Shared.DebugWarning("Disable magnet...");
             MagnetActive = false;
+            base.OnJointBreakFixed();
         }
 
         public void OnPartGrab(Vessel kerbalEvaVessel)
diff --git a/Plugin/KASModuleStrut.cs b/Plugin/KASModuleStrut.cs
index 08954a1b..79fbc5e9 100644
--- a/Plugin/KASModuleStrut.cs
+++ b/Plugin/KASModuleStrut.cs
@@ -248,12 +248,11 @@ protected override void OnPartDie()
             }
         }
 
-        protected override void OnJointBreak(float breakForce)
+        public override void OnJointBreakFixed()
         {
             KAS_Shared.DebugWarning("OnJointBreak(Strut) A joint broken on " + part.partInfo.title + " !, force: " + breakForce);
             Unlink();
             fxSndBroke.audio.Play();
-            base.OnJointBreak(breakForce);
         }
 
         public void OnPartGrab(Vessel kerbalEvaVessel)
@@ -315,7 +314,7 @@ private bool LinkTo(KASModuleStrut tgtModule, bool checkCondition = true, bool s
             {
                 if (!CheckLink(this.strutTransform, tgtModule.strutTransform, true))
                 {
-                    ScreenMessages.PostScreenMessage("Max angle or lenght reached, cannot link !", 5, ScreenMessageStyle.UPPER_CENTER);
+                    ScreenMessages.PostScreenMessage("Max angle or length reached, cannot link !", 5, ScreenMessageStyle.UPPER_CENTER);
                     return false;
                 }
 
@@ -555,7 +554,7 @@ public void ContextMenuLink()
             else
             {
                 SetEvaLink();
-                ScreenMessages.PostScreenMessage("Link mode enabled, press Echap or Enter to cancel", 10, ScreenMessageStyle.UPPER_CENTER);
+                ScreenMessages.PostScreenMessage("Link mode enabled, press Escape or Enter to cancel", 10, ScreenMessageStyle.UPPER_CENTER);
             }
         }
 
diff --git a/Plugin/KASModuleWinch.cs b/Plugin/KASModuleWinch.cs
index a401ab3b..fc7f2f1c 100644
--- a/Plugin/KASModuleWinch.cs
+++ b/Plugin/KASModuleWinch.cs
@@ -1161,11 +1161,13 @@ public void Eject()
             if (headState == PlugState.Locked && ejectEnabled)
             {
                 Deploy();
+                retract.full = false;
                 cableJointLength = maxLenght;
                 Vector3 force = winchAnchorNode.TransformDirection(Vector3.forward) * ejectForce;
                 if (connectedPortInfo.module)
                 {
-                    connectedPortInfo.module.part.Rigidbody.AddForce(force, ForceMode.Force);
+                    //connectedPortInfo.module.part.Rigidbody.AddForce(force, ForceMode.Force);
+                    StartCoroutine(WaitAndApplyForce(force));
                 }
                 else
                 {
@@ -1176,6 +1178,13 @@ public void Eject()
             }
         }
 
+        // X64 fix for eject
+        private IEnumerator WaitAndApplyForce(Vector3 force)
+        {
+            yield return new WaitForFixedUpdate();
+            connectedPortInfo.module.part.Rigidbody.AddForce(force, ForceMode.Force);
+        }
+
         private bool IsLockable()
         {
             float distance = Vector3.Distance(winchAnchorNode.position, headAnchorNode.position);
diff --git a/Plugin/KAS_Shared.cs b/Plugin/KAS_Shared.cs
index 50c9b2e1..b2113b95 100644
--- a/Plugin/KAS_Shared.cs
+++ b/Plugin/KAS_Shared.cs
@@ -554,7 +554,7 @@ public static Part CreatePart(AvailablePart avPart, Vector3 position, Quaternion
             {
                 ConfigNode node = new ConfigNode();
                 node.AddValue("name", newPart.Modules[i].moduleName);
-                newPart.LoadModule(node, i);
+                newPart.LoadModule(node, ref i);
             }
 
             return newPart;
@@ -574,7 +574,10 @@ public static ConfigNode SavePartSnapshot(Part part)
 
             snapshot.Save(node);
 
+            float dry_cost, fuel_cost;
+            float total_cost = ShipConstruction.GetPartCosts(snapshot, part.partInfo, out dry_cost, out fuel_cost);
             node.AddValue("kas_total_mass", part.mass+part.GetResourceMass());
+            node.AddValue("kas_total_cost", total_cost);
 
             // Prune unimportant data
             node.RemoveValues("parent");
@@ -647,14 +650,20 @@ public void Restore(Rigidbody rb)
             }
         }
 
-        public static Part LoadPartSnapshot(Vessel vessel, ConfigNode node, Vector3 position, Quaternion rotation)
+        public static ProtoPartSnapshot LoadProtoPartSnapshot(ConfigNode node)
         {
             ConfigNode node_copy = new ConfigNode();
             node.CopyTo(node_copy);
 
             node_copy.RemoveValues("kas_total_mass");
+            node_copy.RemoveValues("kas_total_cost");
+
+            return new ProtoPartSnapshot(node_copy, null, HighLogic.CurrentGame);
+        }
 
-            ProtoPartSnapshot snapshot = new ProtoPartSnapshot(node_copy, null, HighLogic.CurrentGame);
+        public static Part LoadPartSnapshot(Vessel vessel, ConfigNode node, Vector3 position, Quaternion rotation)
+        {
+            ProtoPartSnapshot snapshot = KAS_Shared.LoadProtoPartSnapshot(node);
 
             if (HighLogic.CurrentGame.flightState.ContainsFlightID(snapshot.flightID))
                 snapshot.flightID = ShipConstruction.GetUniqueFlightID(HighLogic.CurrentGame.flightState);
diff --git a/addModule.cfg b/addModule.cfg
deleted file mode 100644
index 39e236f2..00000000
--- a/addModule.cfg
+++ /dev/null
@@ -1,385 +0,0 @@
-///////// linearRcs ///////
-GRAB
-{
-	stockPartName = linearRcs
-	evaPartPos = (0.0, 0.00, -0.21)
-	evaPartDir = (0,0,-1)
-	dropAtGroundPos = false
-	dropPartPos = (0.0, -0.1, -0.65)
-	dropPartRot = (0.0, 90.0, 0.0)
-	addPartMass = true
-	storable = true
-	storedSize = 4
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// RCSBlock ///////
-GRAB
-{
-	stockPartName = RCSBlock
-	evaPartPos = (0.0, 0.00, -0.18)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 6
-	attachOnPart = True
-	attachOnEva = True
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// roverWheel2 ///////
-GRAB
-{
-	stockPartName = roverWheel2
-	evaPartPos = (0.0, 0.48, -0.14)
-	evaPartDir = (0,-0.3,-1)
-	storable = true
-	storedSize = 30
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// batteryPack ///////
-GRAB
-{
-	stockPartName = batteryPack
-	evaPartPos = (0.0, 0.00, -0.15)
-	evaPartDir = (0,0,-1)
-	storable = true
-	stateless = false
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// spotLight1 ///////
-GRAB
-{
-	stockPartName = spotLight1
-	evaPartPos = (0.0, 0.00, -0.15)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 8
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// spotLight2 ///////
-GRAB
-{
-	stockPartName = spotLight2
-	evaPartPos = (0.0, 0.00, -0.15)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 8
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// ladder1 ///////
-GRAB
-{
-	stockPartName = ladder1
-	evaPartPos = (0.0, -0.03, -0.1)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// telescopicLadder ///////
-GRAB
-{
-	stockPartName = telescopicLadder 
-	evaPartPos = (0.0, -0.07, -0.34)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 25
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// telescopicLadderBay ///////
-GRAB
-{
-	stockPartName = telescopicLadderBay
-	evaPartPos = (0.0, -0.07, -0.34)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 30
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// solarPanels1 ///////
-GRAB
-{
-	stockPartName = solarPanels1
-	evaPartPos = (0.0, 0.00, -0.22)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// solarPanels2 ///////
-GRAB
-{
-	stockPartName = solarPanels2
-	evaPartPos = (0.0, 0.00, -0.22)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// solarPanels3 ///////
-GRAB
-{
-	stockPartName = solarPanels3
-	evaPartPos = (0.0, 0.00, -0.22)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// solarPanels4 ///////
-GRAB
-{
-	stockPartName = solarPanels4
-	evaPartPos = (0.0, 0.00, -0.22)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// solarPanels5 ///////
-GRAB
-{
-	stockPartName = solarPanels5
-	evaPartPos = (0.0, 0.12, -0.14)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// rtg ///////
-GRAB
-{
-	stockPartName = rtg
-	evaPartPos = (0.0, 0.00, -0.10)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 20
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// seatExternalCmd ///////
-GRAB
-{
-	stockPartName = seatExternalCmd
-	evaPartPos = (0.0, 0.00, -0.15)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 20
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// smallRadialEngine ///////
-GRAB
-{
-	stockPartName = smallRadialEngine
-	evaPartPos = (0.0, 0.12, -0.14)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 15
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// radialEngineMini ///////
-GRAB
-{
-	stockPartName = radialEngineMini
-	evaPartPos = (0.0, 0.00, -0.15)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// radialRCSTank ///////
-GRAB
-{
-	stockPartName = radialRCSTank
-	evaPartPos = (0.0, 0.00, -0.29)
-	evaPartDir = (0,0,-1)
-	storable = true
-	stateless = false
-	storedSize = 30
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// xenonTankRadial ///////
-GRAB
-{
-	stockPartName = xenonTankRadial
-	evaPartPos = (0.0, 0.00, -0.15)
-	evaPartDir = (0,0,-1)
-	storable = true
-	stateless = false
-	storedSize = 25
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// strutCube ///////
-GRAB
-{
-	stockPartName = strutCube
-	evaPartPos = (0.0, 0.00, -0.11)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// sensorAccelerometer ///////
-GRAB
-{
-	stockPartName = sensorAccelerometer
-	evaPartPos = (0.0, 0.00, -0.12)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// sensorBarometer ///////
-GRAB
-{
-	stockPartName = sensorBarometer
-	evaPartPos = (0.0, 0.00, -0.12)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// sensorGravimeter ///////
-GRAB
-{
-	stockPartName = sensorGravimeter
-	evaPartPos = (0.0, 0.00, -0.12)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// sensorThermometer ///////
-GRAB
-{
-	stockPartName = sensorThermometer 
-	evaPartPos = (0.0, 0.00, -0.12)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// commDish ///////
-GRAB
-{
-	stockPartName = commDish
-	evaPartPos = (0.0, 0.00, -0.35)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 10
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// mediumDishAntenna ///////
-GRAB
-{
-	stockPartName = mediumDishAntenna
-	evaPartPos = (0.0, 0.15, -0.18)
-	evaPartDir = (0,-0.15,-1)
-	storable = true
-	storedSize = 8
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// longAntenna ///////
-GRAB
-{
-	stockPartName = longAntenna
-	evaPartPos = (0.0, 0.00, -0.09)
-	evaPartDir = (0,0,-1)
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
-///////// parachuteRadial ///////
-GRAB
-{
-	stockPartName = parachuteRadial
-	evaPartPos = (0.0, 0.09, -0.23)
-	evaPartDir = (0,0,-1)
-	physicJoint = true
-	storable = true
-	storedSize = 5
-	attachOnPart = True
-	attachOnEva = False
-	attachOnStatic = False
-	attachSendMsgOnly = False
-}
\ No newline at end of file