diff --git a/Subsurface/Content/Map/StructurePrefabs.xml b/Subsurface/Content/Map/StructurePrefabs.xml
index c0c311d07..5b7b2af85 100644
--- a/Subsurface/Content/Map/StructurePrefabs.xml
+++ b/Subsurface/Content/Map/StructurePrefabs.xml
@@ -48,18 +48,6 @@
   <topwall sprite="Content/Map/testroom.png" sourcerect="144,464,496,32" depth ="0.06" castshadow="true"
     width = "64" height ="32" resizehorizontal="true" body="true" health="500"/>
 
-  <CornerUpperLeft sprite="Content/Map/testroom.png" sourcerect="192,512,224,160" depth ="0.03"
-    width = "224" height ="160"/>
-
-  <CornerUpperRight sprite="Content/Map/testroom.png" sourcerect="416,512,224,160" depth ="0.03"
-    width = "224" height ="160"/>
-
-  <CornerBottomLeft sprite="Content/Map/testroom.png" sourcerect="192,512,224,160" depth ="0.03"
-    width = "224" height ="160" flipvertical="true"/>
-
-  <CornerBottomRight sprite="Content/Map/testroom.png" sourcerect="416,512,224,160" depth ="0.03"
-    width = "224" height ="160" flipvertical="true"/>  
-  
   <topwindow sprite="Content/Map/testroom.png" sourcerect="208,352,128,80" depth ="0.05"
     width = "128" height ="80" body="true" health="100"/>
 
diff --git a/Subsurface/Content/Particles/ParticlePrefabs.xml b/Subsurface/Content/Particles/ParticlePrefabs.xml
index 457077a27..e8db4ff60 100644
--- a/Subsurface/Content/Particles/ParticlePrefabs.xml
+++ b/Subsurface/Content/Particles/ParticlePrefabs.xml
@@ -9,6 +9,7 @@
     lifetime="2"
     growtime ="0.2"
     collideswithwalls="true"
+    collisionradius="30.0"
     velocitychange="0.0, -9.8">
     <sprite texture="Content/Particles/spatter.png" sourcerect="0,0,128,128"/>
     <sprite texture="Content/Particles/spatter.png" sourcerect="128,0,128,128"/>
diff --git a/Subsurface/Source/Characters/HumanoidAnimController.cs b/Subsurface/Source/Characters/HumanoidAnimController.cs
index 2e60657b6..8244d80e6 100644
--- a/Subsurface/Source/Characters/HumanoidAnimController.cs
+++ b/Subsurface/Source/Characters/HumanoidAnimController.cs
@@ -196,9 +196,7 @@ namespace Barotrauma
             Limb rightLeg   = GetLimb(LimbType.RightLeg);
 
             if (character.SelectedCharacter != null) DragCharacter(character.SelectedCharacter);
-
-
-
+            
             float getUpSpeed = 0.3f;
             float walkCycleSpeed = head.LinearVelocity.X * walkAnimSpeed;
             if (stairs != null)
@@ -261,7 +259,7 @@ namespace Barotrauma
 
             if (!onGround || (LowestLimb.SimPosition.Y - floorY > 0.5f && stairs == null)) return;
 
-            getUpSpeed = getUpSpeed * (head.SimPosition.Y - colliderPos.Y);
+            getUpSpeed = getUpSpeed * Math.Max(head.SimPosition.Y - colliderPos.Y, 0.1f);
 
             if (stairs != null)
             {
diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs
index dc3c86612..d5f9d2be1 100644
--- a/Subsurface/Source/DebugConsole.cs
+++ b/Subsurface/Source/DebugConsole.cs
@@ -53,7 +53,7 @@ namespace Barotrauma
             frame.Color = Color.White * 0.4f;
             frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f);
 
-            listBox = new GUIListBox(new Rectangle(0,0,0, frame.Rect.Height-40), Color.Black*0.8f, null, frame);
+            listBox = new GUIListBox(new Rectangle(0,0,0, frame.Rect.Height-40), Color.Black*0.9f, null, frame);
 
             textBox = new GUITextBox(new Rectangle(0,0,0,20), Color.Black*0.6f, Color.White, Alignment.BottomLeft, Alignment.Left, null, frame);
             NewMessage("Press F3 to open/close the debug console", Color.Cyan);
diff --git a/Subsurface/Source/Sounds/SoundPlayer.cs b/Subsurface/Source/Sounds/SoundPlayer.cs
index 7b9d21872..b82a845f6 100644
--- a/Subsurface/Source/Sounds/SoundPlayer.cs
+++ b/Subsurface/Source/Sounds/SoundPlayer.cs
@@ -197,7 +197,7 @@ namespace Barotrauma
 
             //how fast the sub is moving, scaled to 0.0 -> 1.0
             float movementFactor = 0.0f;
-            if (Submarine.Loaded!=null)
+            if (Submarine.Loaded != null)
             {
                 movementFactor = (Submarine.Loaded.Speed == Vector2.Zero) ? 0.0f : Submarine.Loaded.Speed.Length() / 500.0f;
 
diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt
index 59f1566d0..c4863a76f 100644
--- a/Subsurface/changelog.txt
+++ b/Subsurface/changelog.txt
@@ -1,4 +1,34 @@
 
+---------------------------------------------------------------------------------------------------------
+v0.2.6
+---------------------------------------------------------------------------------------------------------
+
+Multiplayer:
+	- major changes to the networking code: better lag compensation, more reliable item/character
+	syncing, lower bandwidth consumption
+	- spectator mode
+	
+Submarine:
+	- overloading the electrical grid or the reactor may cause fires
+
+Characters:
+	- blood texture drawn on damaged limbs
+	- fixed limbs clipping through walls
+	- some new head sprites
+
+Items:
+	- underwater scooters
+	- water detector
+	- jumpsuits for engineers and mechanics
+	- new artifact with an effect that makes retrieving it much harder
+	- less obtrusive ''fow effect'' when wearing a diving suit or a mask
+	- fire extinguishers
+	- some new sprites
+
+Misc:
+	- fixed placing ladders and labels in sub editor
+	- fixed a couple of game-crashing bugs in submarine saving
+	
 ---------------------------------------------------------------------------------------------------------
 v0.2.5
 ---------------------------------------------------------------------------------------------------------
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index 8ecac5e38..620b8c7b6 100644
Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ