diff --git a/DepthsBelow/DepthsBelow/Camera.cs b/DepthsBelow/DepthsBelow/Camera.cs
index f2078db..07c2db3 100644
--- a/DepthsBelow/DepthsBelow/Camera.cs
+++ b/DepthsBelow/DepthsBelow/Camera.cs
@@ -1,53 +1,55 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
-
-namespace DepthsBelow
-{
-	public class Camera
-	{
-		public float Zoom;
-		public Matrix Transform;
-		public Vector2 Position;
-		public float Rotation;
-
-		public float Speed;
-
-		private Core core;
-
-		public Camera(Core core)
-		{
-			this.core = core;
-
-			Zoom = 1.0f;
-			Rotation = 0.0f;
-			Position = Vector2.Zero;
-			Speed = 5;
-		}
-
-		public void Update(GameTime gameTime)
-		{
-			MouseState ms = Mouse.GetState();
-
-			if (ms.X < 20)
-				Position.X -= Speed;
-			if (ms.X > core.GraphicsDevice.Viewport.Width - 20)
-				Position.X += Speed;
-
-			if (ms.Y < 20)
-				Position.Y -= Speed;
-			if (ms.Y > core.GraphicsDevice.Viewport.Height - 20)
-				Position.Y += Speed;
-
-			Transform = 
-				Matrix.CreateTranslation(new Vector3(-Position.X, -Position.Y, 0))
-				* Matrix.CreateRotationZ(Rotation)
-				* Matrix.CreateScale(Zoom)
-				//* Matrix.CreateTranslation(new Vector3(
-			;
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input;
+
+namespace DepthsBelow
+{
+	public class Camera
+	{
+		public float Zoom;
+		public Matrix Transform;
+		public Vector2 Position;
+		public float Rotation;
+
+		public float Speed;
+
+		private Core core;
+
+		public Camera(Core core)
+		{
+			this.core = core;
+
+			Zoom = 1.0f;
+			Rotation = 0.0f;
+			Position = Vector2.Zero;
+			Speed = 300;
+		}
+
+		public void Update(GameTime gameTime)
+		{
+			float elapsed = gameTime.ElapsedGameTime.Milliseconds / 1000.0f;
+
+			MouseState ms = Mouse.GetState();
+
+			if (ms.X < 20)
+				Position.X -= Speed * elapsed;
+			if (ms.X > core.GraphicsDevice.Viewport.Width - 20)
+				Position.X += Speed * elapsed;
+
+			if (ms.Y < 20)
+				Position.Y -= Speed * elapsed;
+			if (ms.Y > core.GraphicsDevice.Viewport.Height - 20)
+				Position.Y += Speed * elapsed;
+
+			Transform = 
+				Matrix.CreateTranslation(new Vector3(-Position.X, -Position.Y, 0))
+				* Matrix.CreateRotationZ(Rotation)
+				* Matrix.CreateScale(Zoom)
+				//* Matrix.CreateTranslation(new Vector3(
+			;
+		}
+	}
+}
diff --git a/DepthsBelow/DepthsBelow/Core.cs b/DepthsBelow/DepthsBelow/Core.cs
index 7d48672..84bdc7f 100644
--- a/DepthsBelow/DepthsBelow/Core.cs
+++ b/DepthsBelow/DepthsBelow/Core.cs
@@ -32,6 +32,10 @@ namespace DepthsBelow
 			graphics.PreferredBackBufferHeight = 720;
 			graphics.IsFullScreen = false;
 
+			graphics.SynchronizeWithVerticalRetrace = false;
+			this.IsFixedTimeStep = false;
+			graphics.ApplyChanges();
+
 			this.IsMouseVisible = true;
 		}