diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 0fb8587a2..68a2ac24e 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -769,6 +769,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Content\Map\structures2.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Map\waypointIcons.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Subsurface/Content/Items/Medical/medical.xml b/Subsurface/Content/Items/Medical/medical.xml
index 4ad18cc4c..44b7570a9 100644
--- a/Subsurface/Content/Items/Medical/medical.xml
+++ b/Subsurface/Content/Items/Medical/medical.xml
@@ -148,7 +148,7 @@
     </ItemComponent>
 
     <Holdable slots="Any,RightHand,LeftHand">
-      <StatusEffect type="OnUse" target="Character" Health="2.0" duration="5.0">
+      <StatusEffect type="OnUse" target="Character" Health="3.0" duration="5.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Holdable>
diff --git a/Subsurface/Content/Map/StructurePrefabs.xml b/Subsurface/Content/Map/StructurePrefabs.xml
index edeb72c34..711353e8f 100644
--- a/Subsurface/Content/Map/StructurePrefabs.xml
+++ b/Subsurface/Content/Map/StructurePrefabs.xml
@@ -119,7 +119,12 @@
 
   <PipesBackground sprite="Content/Map/testroom.png" sourcerect="381,795,192,192" depth = "1.0"
     width="64" height="64" resizehorizontal="true" resizevertical="true"/>
-  
+
+  <SlopeForward sprite="Content/Map/structures2.png" sourcerect="0,0,224,64"
+    width="16" height="16" resizehorizontal="true" resizevertical="true" depth = "0.95"/>
+
+  <SlopeBack sprite="Content/Map/structures2.png" sourcerect="0,64,224,64"
+    width="16" height="16" resizehorizontal="true" resizevertical="true" depth = "0.95"/>
 
   <stairsright sprite="Content/Map/testroom.png" sourcerect="100,667,256,320" 
     width="256" height="320" depth = "0.1" stairdirection="Right"/>
diff --git a/Subsurface/Content/Map/structures2.png b/Subsurface/Content/Map/structures2.png
new file mode 100644
index 000000000..14866b4e6
Binary files /dev/null and b/Subsurface/Content/Map/structures2.png differ
diff --git a/Subsurface/Source/Items/Components/Power/PowerContainer.cs b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
index 003381b5e..f6400c72e 100644
--- a/Subsurface/Source/Items/Components/Power/PowerContainer.cs
+++ b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
@@ -36,6 +36,13 @@ namespace Barotrauma.Items.Components
             get { return maxOutput; }
         }
 
+        [HasDefaultValue(10.0f, true), Editable]
+        public float Capacity
+        {
+            get { return capacity; }
+            set { capacity = Math.Max(value, 1.0f); }
+        }
+
         [Editable, HasDefaultValue(0.0f, true)]
         public float Charge
         {
@@ -47,13 +54,6 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [HasDefaultValue(10.0f, true), Editable]
-        public float Capacity
-        {
-            get { return capacity; }
-            set { capacity = Math.Max(value, 1.0f); }
-        }
-
         [HasDefaultValue(10.0f, true), Editable]
         public float RechargeSpeed
         {
diff --git a/Subsurface/Source/Sounds/SoundPlayer.cs b/Subsurface/Source/Sounds/SoundPlayer.cs
index 07f4da930..6663693a2 100644
--- a/Subsurface/Source/Sounds/SoundPlayer.cs
+++ b/Subsurface/Source/Sounds/SoundPlayer.cs
@@ -7,6 +7,7 @@ using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 using Barotrauma.Sounds;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Barotrauma
 {
@@ -249,7 +250,16 @@ namespace Barotrauma
                 if (currMusicVolume < 0.01f)
                 {
                     Sound.StopStream();
-                    if (targetMusic != null) Sound.StartStream(targetMusic.file, currMusicVolume);
+
+                    try
+                    {
+                        if (targetMusic != null) Sound.StartStream(targetMusic.file, currMusicVolume);
+                    }
+                    catch (FileNotFoundException e)
+                    {
+                        DebugConsole.ThrowError("Music clip " + targetMusic.file + " not found!");
+                    }
+
                     currentMusic = targetMusic;
                 }
             }