diff --git a/Subsurface/Content/Items/Electricity/poweritems.xml b/Subsurface/Content/Items/Electricity/poweritems.xml
index 3f2948508..ec8bbc4fb 100644
--- a/Subsurface/Content/Items/Electricity/poweritems.xml
+++ b/Subsurface/Content/Items/Electricity/poweritems.xml
@@ -16,7 +16,7 @@
     </fixrequirement>
 
     <PowerTransfer canbeselected = "true">
-      <StatusEffect type="InWater" target="This" condition="-1.0"/>
+      <StatusEffect type="InWater" target="This" condition="-0.5"/>
       <GuiFrame rect="0,0,350,160" alignment="Center" color="0.0,0.0,0.0,0.6"/>
     </PowerTransfer>
 
diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs
index 67a0e341d..52e196935 100644
--- a/Subsurface/Source/Networking/NetworkMember.cs
+++ b/Subsurface/Source/Networking/NetworkMember.cs
@@ -107,12 +107,7 @@ namespace Barotrauma.Networking
         {
             get { return inGameHUD; }
         }
-
-        public GUIListBox ChatBox
-        {
-            get { return chatBox; }
-        }
-
+        
         public NetworkMember()
         {
             inGameHUD = new GUIFrame(new Rectangle(0,0,0,0), null, null);
@@ -204,7 +199,7 @@ namespace Barotrauma.Networking
         {
             if (sender == null) return false;
 
-            var radio = sender.Inventory.Items.First(i => i != null && i.GetComponent<WifiComponent>() != null);
+            var radio = sender.Inventory.Items.FirstOrDefault(i => i != null && i.GetComponent<WifiComponent>() != null);
             if (radio == null || !sender.HasEquippedItem(radio)) return false;
                        
             var radioComponent = radio.GetComponent<WifiComponent>();
@@ -231,7 +226,9 @@ namespace Barotrauma.Networking
         
         public void AddChatMessage(ChatMessage message)
         {
-            if (message.Type == ChatMessageType.Radio && message.Sender != null && message.Sender != myCharacter)
+            if (message.Type == ChatMessageType.Radio && 
+                Character.Controlled != null &&
+                message.Sender != null && message.Sender != myCharacter)
             {
                 var radio = message.Sender.Inventory.Items.First(i => i != null && i.GetComponent<WifiComponent>() != null);
                 if (radio == null) return;
@@ -247,9 +244,9 @@ namespace Barotrauma.Networking
 
             if (message.Sender != null)
             {
-                if (message.Type == ChatMessageType.Default && myCharacter != null)
+                if (message.Type == ChatMessageType.Default && Character.Controlled != null)
                 {
-                    displayedText = message.ApplyDistanceEffect(myCharacter);
+                    displayedText = message.ApplyDistanceEffect(Character.Controlled);
                     if (string.IsNullOrWhiteSpace(displayedText)) return;
                 }
 
@@ -303,8 +300,8 @@ namespace Barotrauma.Networking
         {
             if (gameStarted && Screen.Selected == GameMain.GameScreen)
             {
-                chatBox.Visible = Character.Controlled == null || !Character.Controlled.IsUnconscious;
-                chatMsgBox.Visible = chatBox.Visible;
+                //chatBox.Visible = Character.Controlled == null || !Character.Controlled.IsUnconscious;
+                chatMsgBox.Visible = Character.Controlled == null || !Character.Controlled.IsUnconscious;
 
                 inGameHUD.Update(deltaTime);
 
@@ -319,7 +316,7 @@ namespace Barotrauma.Networking
                 }
             }
 
-            if (PlayerInput.KeyHit(InputType.Chat))
+            if (PlayerInput.KeyHit(InputType.Chat) && chatMsgBox.Visible)
             {
                 if (chatMsgBox.Selected)
                 {
diff --git a/Subsurface/Submarines/Aegir Mark II.sub b/Subsurface/Submarines/Aegir Mark II.sub
index 8389454f6..5af3d90a0 100644
Binary files a/Subsurface/Submarines/Aegir Mark II.sub and b/Subsurface/Submarines/Aegir Mark II.sub differ
diff --git a/Subsurface/Submarines/Nehalennia.sub b/Subsurface/Submarines/Nehalennia.sub
index 63a0476db..9ee09eff9 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 020c97717..81e7cd6c0 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 e25a6df22..c4ec02a42 100644
--- a/Subsurface/changelog.txt
+++ b/Subsurface/changelog.txt
@@ -1,3 +1,12 @@
+---------------------------------------------------------------------------------------------------------
+v0.4.0.1
+---------------------------------------------------------------------------------------------------------
+
+- radio messages are visible to spectators
+- added a bunch of handheld sonars to the vanilla subs
+- junction boxes take more time to break in water
+- moved the junction boxes inside Nehalennia's ballast tanks to a drier location
+
 ---------------------------------------------------------------------------------------------------------
 v0.4.0.0
 ---------------------------------------------------------------------------------------------------------