diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs
index 0faf1b81e..59780ee7e 100644
--- a/Subsurface/Properties/AssemblyInfo.cs
+++ b/Subsurface/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.4.0")]
-[assembly: AssemblyFileVersion("0.5.4.0")]
+[assembly: AssemblyVersion("0.5.4.1")]
+[assembly: AssemblyFileVersion("0.5.4.1")]
diff --git a/Subsurface/Source/Characters/Animation/FishAnimController.cs b/Subsurface/Source/Characters/Animation/FishAnimController.cs
index ee420f416..543339e16 100644
--- a/Subsurface/Source/Characters/Animation/FishAnimController.cs
+++ b/Subsurface/Source/Characters/Animation/FishAnimController.cs
@@ -205,15 +205,15 @@ namespace Barotrauma
                 if (Limbs[i].SteerForce <= 0.0f) continue;
 
                 Vector2 pullPos = Limbs[i].pullJoint == null ? Limbs[i].SimPosition : Limbs[i].pullJoint.WorldAnchorA;
-                Limbs[i].body.ApplyForce(movement * Limbs[i].SteerForce * Limbs[i].Mass, pullPos);                
+                Limbs[i].body.ApplyForce(movement * Limbs[i].SteerForce * Limbs[i].Mass, pullPos);
 
-                if (Limbs[i] == MainLimb) continue;
+                /*if (Limbs[i] == MainLimb) continue;
 
                 float dist = (MainLimb.SimPosition - Limbs[i].SimPosition).Length();
 
                 Vector2 limbPos = MainLimb.SimPosition - Vector2.Normalize(movement) * dist;
 
-                Limbs[i].body.ApplyForce(((limbPos - Limbs[i].SimPosition) * 3.0f - Limbs[i].LinearVelocity * 3.0f) * Limbs[i].Mass);
+                Limbs[i].body.ApplyForce(((limbPos - Limbs[i].SimPosition) * 3.0f - Limbs[i].LinearVelocity * 3.0f) * Limbs[i].Mass);*/
             }
             
             Collider.LinearVelocity = Vector2.Lerp(Collider.LinearVelocity, movement, 0.5f);
diff --git a/Subsurface/Submarines/Aegir Mark III.sub b/Subsurface/Submarines/Aegir Mark III.sub
index 6cab2cb69..da7dc9ada 100644
Binary files a/Subsurface/Submarines/Aegir Mark III.sub and b/Subsurface/Submarines/Aegir Mark III.sub differ
diff --git a/Subsurface/Submarines/Nehalennia.sub b/Subsurface/Submarines/Nehalennia.sub
index 1a8b8aa01..512b0e158 100644
Binary files a/Subsurface/Submarines/Nehalennia.sub and b/Subsurface/Submarines/Nehalennia.sub differ
diff --git a/Subsurface/Submarines/Vellamo.sub b/Subsurface/Submarines/Vellamo.sub
index 6d35b7f4d..90cb4f5a0 100644
Binary files a/Subsurface/Submarines/Vellamo.sub and b/Subsurface/Submarines/Vellamo.sub differ
diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt
index b13ee2981..2f80e4bf3 100644
--- a/Subsurface/changelog.txt
+++ b/Subsurface/changelog.txt
@@ -1,3 +1,28 @@
+---------------------------------------------------------------------------------------------------------
+v0.5.4.1
+---------------------------------------------------------------------------------------------------------
+
+Bugfixes:
+	- copypasted items are now correctly aligned to the "grid"
+	- cabinets can be copypasted from a sub to another without the items inside disappearing
+	- placing explosives inside an item and that item inside another item doesn't prevent explosions
+	- fixed a bug that occasionally caused crashing when the game happens to generate a very small level
+
+Sub editor:
+	- structures/items that are behind something else can be selected using a listbox that appears 
+	when hovering the cursor over them	
+	- wires have to be selected by clicking before any of the points can be moved (makes it possible 
+	to move	the correct wire even if it's overlapping with other wires)
+	- the selected wire is renderer over all structures
+	- points can be added to wires by clicking while holding ctrl
+	- disabled music
+
+Misc:
+	- some rendering optimization	
+	- pathfinding and waypoint generation improvements
+	- made mantises more aggressive
+	- water flows more slowly through partially damaged walls	
+
 ---------------------------------------------------------------------------------------------------------
 v0.5.4.0
 ---------------------------------------------------------------------------------------------------------