diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index d409ae7fdb..026dc0465c 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1128,10 +1128,12 @@ namespace BizHawk.MultiClient
                 {
                     UserMovie.WriteMovie();
                     UserMovie.StartPlayback();
+                    Global.ActiveController.MovieMode = true;
                     //run loadstate-readonly function
                 }
                 else
                 {
+                    Global.ActiveController.MovieMode = false;
                     UserMovie.LoadLogFromSavestateText(reader);
                 }
             }
@@ -1143,8 +1145,9 @@ namespace BizHawk.MultiClient
                 }
                 else
                 {
-                    //switch to record mode
-                    //LoadLogFromSavestateText()
+                    UserMovie.StartNewRecording();
+                    Global.ActiveController.MovieMode = false;
+                    UserMovie.LoadLogFromSavestateText(reader);
                 }
             }
             else if (UserMovie.GetMovieMode() == MOVIEMODE.FINISHED)
@@ -1798,6 +1801,12 @@ namespace BizHawk.MultiClient
                 readonlyToolStripMenuItem.Checked = true;
             else
                 readonlyToolStripMenuItem.Checked = false;
+
+            readonlyToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.ReadOnlyToggleBinding;
+            recordMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.RecordMovieBinding;
+            playMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PlayMovieBinding;
+            stopMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.StopMovieBinding;
+            playFromBeginningToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.PlayBeginningBinding;
         }
 
         public void ToggleReadOnly()
diff --git a/BizHawk.MultiClient/PlayMovie.Designer.cs b/BizHawk.MultiClient/PlayMovie.Designer.cs
index f440abee0c..6328836db6 100644
--- a/BizHawk.MultiClient/PlayMovie.Designer.cs
+++ b/BizHawk.MultiClient/PlayMovie.Designer.cs
@@ -103,6 +103,7 @@
             this.MovieView.UseCompatibleStateImageBehavior = false;
             this.MovieView.View = System.Windows.Forms.View.Details;
             this.MovieView.SelectedIndexChanged += new System.EventHandler(this.MovieView_SelectedIndexChanged);
+            this.MovieView.DoubleClick += new System.EventHandler(this.MovieView_DoubleClick);
             // 
             // columnHeader1
             // 
diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs
index 7d3c08ccca..a44f00c861 100644
--- a/BizHawk.MultiClient/PlayMovie.cs
+++ b/BizHawk.MultiClient/PlayMovie.cs
@@ -54,9 +54,14 @@ namespace BizHawk.MultiClient
             this.Close();
         }
 
-        private void OK_Click(object sender, EventArgs e)
+        private void Run()
         {
             Global.MainForm.StartNewMovie(MovieList[MovieView.SelectedIndices[0]], false);
+        }
+
+        private void OK_Click(object sender, EventArgs e)
+        {
+            Run();
             this.Close();
         }
 
@@ -159,5 +164,11 @@ namespace BizHawk.MultiClient
         {
             //TODO: a subtitle viewer/editor
         }
+
+        private void MovieView_DoubleClick(object sender, EventArgs e)
+        {
+            Run();
+            this.Close();
+        }
     }
 }
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index 24485d7b4f..5a434ca636 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -292,18 +292,19 @@ namespace BizHawk.MultiClient
 
             if (Global.Config.DisplayLagCounter)
             {
-                MessageFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx + 1,
-                    Global.Config.DispLagy + 1, new Color4(Color.Black));
-                
                 if (Global.Emulator.IsLagFrame)
                 {
+                    AlertFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx + 1,
+                        Global.Config.DispLagy + 1, new Color4(Color.Black));
                     AlertFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx,
-                    Global.Config.DispLagy, Color.FromArgb(Global.Config.AlertMessageColor));
+                        Global.Config.DispLagy, Color.FromArgb(Global.Config.AlertMessageColor));
                 }
                 else
                 {
+                    MessageFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx + 1,
+                        Global.Config.DispLagy + 1, new Color4(Color.Black));
                     MessageFont.DrawString(null, MakeLagCounter(), Global.Config.DispLagx,
-                    Global.Config.DispLagy, Color.FromArgb(Global.Config.MessagesColor));
+                        Global.Config.DispLagy, Color.FromArgb(Global.Config.MessagesColor));
                 }
                 
             }