diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 4f4db8e1c..47a1f3b6b 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -98,7 +98,7 @@
     <Compile Include="Source\Map\Levels\WrappingWall.cs" />
     <Compile Include="Source\Map\Lights\LightSource.cs" />
     <Compile Include="Source\Map\LocationType.cs" />
-    <Compile Include="Source\Map\SubmarineHull.cs" />
+    <Compile Include="Source\Map\SubmarineBody.cs" />
     <Compile Include="Source\Networking\BanList.cs" />
     <Compile Include="Source\Networking\NetConfig.cs" />
     <Compile Include="Source\Networking\NetStats.cs" />
@@ -234,7 +234,7 @@
     <Compile Include="Source\Sounds\SoundManager.cs" />
     <Compile Include="Source\Sounds\OggStream.cs" />
     <Compile Include="Source\Sounds\Sound.cs" />
-    <Compile Include="Source\Sounds\AmbientSoundManager.cs" />
+    <Compile Include="Source\Sounds\SoundPlayer.cs" />
     <Compile Include="Source\Sprite.cs" />
     <Compile Include="Source\Utils\TextureLoader.cs" />
     <Compile Include="Source\Utils\ToolBox.cs" />
diff --git a/Subsurface/Source/Items/Components/Machines/Radar.cs b/Subsurface/Source/Items/Components/Machines/Radar.cs
index a53794544..d04e4cd2e 100644
--- a/Subsurface/Source/Items/Components/Machines/Radar.cs
+++ b/Subsurface/Source/Items/Components/Machines/Radar.cs
@@ -12,6 +12,8 @@ namespace Barotrauma.Items.Components
 {
     class Radar : Powered
     {
+        const float displayScale = 0.015f;
+
         private float range;
 
         private float pingState;
@@ -110,20 +112,13 @@ namespace Barotrauma.Items.Components
 
             if (!IsActive) return;
 
-
-            //if (pingCircle!=null)
-            //{
-
-
-                float pingRadius = (rect.Width / 2) * pingState;
-                pingCircle.Draw(spriteBatch, center, Color.White * (1.0f-pingState), 0.0f, (rect.Width/pingCircle.size.X)*pingState);
+            float pingRadius = (rect.Width / 2) * pingState;
+            pingCircle.Draw(spriteBatch, center, Color.White * (1.0f-pingState), 0.0f, (rect.Width/pingCircle.size.X)*pingState);
                 
-            //}
 
             float radius = rect.Width / 2.0f;
             
             float simScale = 1.5f;
-            float displayScale = 0.015f;
 
             if (Level.Loaded != null)
             {
@@ -149,17 +144,20 @@ namespace Barotrauma.Items.Components
                             float pointDist = point.Length() * displayScale;
 
                             if (pointDist > radius) continue;
-                            if (pointDist > prevPingRadius && pointDist < pingRadius) {
+                            if (pointDist < prevPingRadius || pointDist > pingRadius) continue;
 
-                                for (float z = 0; z<radius-pointDist;z+=10.0f)
-                                {
-                                    var blip = new RadarBlip(
-                                        point + Rand.Vector(150.0f) - Level.Loaded.Position + Vector2.Normalize(point) * z / displayScale,
-                                        Rand.Range(0.8f, 1.0f) / Math.Max(1.0f, z / 10.0f));
 
-                                    radarBlips.Add(blip);
-                                }
+                            float step = 4.0f;
+                            for (float z = 0; z<radius-pointDist;z+=step)
+                            {
+                                var blip = new RadarBlip(
+                                    point + Rand.Vector(150.0f) - Level.Loaded.Position + Vector2.Normalize(point) * z / displayScale,
+                                    Rand.Range(0.8f, 1.0f) / (step-4.0f));
+
+                                radarBlips.Add(blip);
+                                step += 0.5f;
                             }
+                            
                         }
                     }
                 }
@@ -171,7 +169,12 @@ namespace Barotrauma.Items.Components
                     Vector2 end = Submarine.Loaded.HullVertices[(i + 1) % Submarine.Loaded.HullVertices.Count] * simScale;
                     end.Y = -end.Y;
 
-                    GUI.DrawLine(spriteBatch, center + start, center + end, Color.Green);
+                    Vector2 diff = end - start;
+                    Vector2 normalizedDiff = Vector2.Normalize(diff);
+                    for (float x = 0; x < diff.Length(); x+=4.0f )
+                    {
+                        GUI.DrawLine(spriteBatch, center + start, center + end, Color.Green);
+                    }                        
                 }
 
             }
@@ -195,29 +198,11 @@ namespace Barotrauma.Items.Components
                         radarBlips.Add(blip);
                     }
                 }
-                
-                //int width = (int)MathHelper.Clamp(c.Mass / 20, 1, 10);
-
-                //pos.Y = -pos.Y;
-                //pos += center;
-
-                //GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X - width / 2, (int)pos.Y - width / 2, width, width), Color.White, true);                
             }
 
             foreach (RadarBlip radarBlip in radarBlips)
             {
-                Vector2 pos = (radarBlip.Position + Level.Loaded.Position) * displayScale;
-                pos.Y = -pos.Y;
-
-                //spriteBatch.Draw(radarBlipSprite, center+pos,
-                //    new Rectangle((int)(radarBlip.SpriteIndex % 4 * 32), (int)(Math.Floor(radarBlip.SpriteIndex / 4.0f) * 32), 32, 32),
-                //    Color.White * radarBlip.FadeTimer, 0.0f, new Vector2(16.0f, 16.0f), 0.5f, SpriteEffects.None, 0.0f);
-
-                pos.X = MathUtils.Round(pos.X, 4);
-
-                pos.Y = MathUtils.Round(pos.Y, 2);
-
-                GUI.DrawRectangle(spriteBatch, center+pos, new Vector2(4, 2), Color.Green * radarBlip.FadeTimer, true);
+                DrawBlip(spriteBatch, center, radarBlip.Position, Color.Green * radarBlip.FadeTimer);
             }
 
             prevPingRadius = pingRadius;
@@ -280,6 +265,22 @@ namespace Barotrauma.Items.Components
             voltage = 0.0f;
         }
 
+        private void DrawBlip(SpriteBatch spriteBatch, Vector2 center, Vector2 pos, Color color)
+        {
+            pos = (pos + Level.Loaded.Position) * displayScale;
+            pos.Y = -pos.Y;
+
+            //spriteBatch.Draw(radarBlipSprite, center+pos,
+            //    new Rectangle((int)(radarBlip.SpriteIndex % 4 * 32), (int)(Math.Floor(radarBlip.SpriteIndex / 4.0f) * 32), 32, 32),
+            //    Color.White * radarBlip.FadeTimer, 0.0f, new Vector2(16.0f, 16.0f), 0.5f, SpriteEffects.None, 0.0f);
+
+            pos.X = MathUtils.Round(pos.X, 4);
+
+            pos.Y = MathUtils.Round(pos.Y, 2);
+
+            GUI.DrawRectangle(spriteBatch, center + pos, new Vector2(4, 2), color, true);
+        }
+
         private void DrawMarker(SpriteBatch spriteBatch, string label, Vector2 position, float scale, Vector2 center, float radius)
         {
             //position += Level.Loaded.Position;
diff --git a/Subsurface/Source/Map/Hull.cs b/Subsurface/Source/Map/Hull.cs
index f77300f5d..7da365d7f 100644
--- a/Subsurface/Source/Map/Hull.cs
+++ b/Subsurface/Source/Map/Hull.cs
@@ -288,7 +288,8 @@ namespace Barotrauma
             }
             else
             {
-                LethalPressure += 10.0f * deltaTime;
+                
+                LethalPressure += ( Submarine.Loaded!=null && Submarine.Loaded.AtDamageDepth) ? 100.0f*deltaTime : 10.0f * deltaTime;
             }
 
 
diff --git a/Subsurface/Source/Map/SubmarineHull.cs b/Subsurface/Source/Map/SubmarineBody.cs
similarity index 98%
rename from Subsurface/Source/Map/SubmarineHull.cs
rename to Subsurface/Source/Map/SubmarineBody.cs
index 6083c4a49..20dad48f6 100644
--- a/Subsurface/Source/Map/SubmarineHull.cs
+++ b/Subsurface/Source/Map/SubmarineBody.cs
@@ -257,11 +257,11 @@ namespace Barotrauma
             if (sub.Position.Y > DamageDepth) return;
 
             float depth = DamageDepth - sub.Position.Y;
-            depth = Math.Max(depth, -40000.0f);
+            depth = Math.Min(depth, 40000.0f);
 
            // float prevTimer = depthDamageTimer;
 
-            depthDamageTimer -= deltaTime*depth*PressureDamageMultiplier;
+            depthDamageTimer -= deltaTime*Math.Min(depth,20000)*PressureDamageMultiplier;
 
             //if (prevTimer>5.0f && depthDamageTimer<=5.0f)
             //{
@@ -284,7 +284,7 @@ namespace Barotrauma
                     (Rand.Int(2) == 0) ? Borders.Y : Borders.Y - Borders.Height);
             }
 
-            SoundPlayer.PlayDamageSound(DamageSoundType.Pressure, 50.0f, damagePos, 5000.0f);
+            SoundPlayer.PlayDamageSound(DamageSoundType.Pressure, 50.0f, damagePos, 10000.0f);
 
             GameMain.GameScreen.Cam.Shake = depth * PressureDamageMultiplier * 0.1f;
 
diff --git a/Subsurface/Source/Screens/LobbyScreen.cs b/Subsurface/Source/Screens/LobbyScreen.cs
index 518191b77..abddf7fbe 100644
--- a/Subsurface/Source/Screens/LobbyScreen.cs
+++ b/Subsurface/Source/Screens/LobbyScreen.cs
@@ -67,8 +67,8 @@ namespace Barotrauma
             //new GUITextBlock(new Rectangle(0, 0, 200, 25), 
             //    save, Color.Transparent, Color.White, Alignment.Left, GUI.Style, leftPanel);
 
-            GUITextBlock moneyText = new GUITextBlock(new Rectangle(0, 30, 0, 25),
-                "", Color.Transparent, Color.White, Alignment.TopCenter, GUI.Style, leftPanel);
+            GUITextBlock moneyText = new GUITextBlock(new Rectangle(0, 30, 0, 25), "", GUI.Style, 
+                Alignment.TopCenter, Alignment.Top, leftPanel);
             moneyText.TextGetter = GetMoney;
             
             GUIButton button = new GUIButton(new Rectangle(0, 70, 100, 30), "Map", null, Alignment.TopCenter, GUI.Style, leftPanel);
diff --git a/Subsurface/Source/Sounds/AmbientSoundManager.cs b/Subsurface/Source/Sounds/SoundPlayer.cs
similarity index 100%
rename from Subsurface/Source/Sounds/AmbientSoundManager.cs
rename to Subsurface/Source/Sounds/SoundPlayer.cs
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index e8ad72e74..12ca20a9d 100644
Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ