diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index 6a9cc16682..ec9998af89 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -85,9 +85,9 @@ namespace BizHawk.MultiClient
 				{
 					Log.Truncate(Global.Emulator.Frame);
 				}
-				if (Global.MainForm.TAStudio1.Engaged)
-					Log.AddFrame(Global.MainForm.TAStudio1.GetMnemonic());
-				else
+//				if (Global.MainForm.TAStudio1.Engaged)
+//					Log.AddFrame(Global.MainForm.TAStudio1.GetMnemonic());
+//				else
 					Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic());
 			}
 		}
@@ -102,12 +102,12 @@ namespace BizHawk.MultiClient
 		}
 
 		//Movie editing tools may like to have something like this
-		public void AddFrame(string record)
+		public void AppendFrame(string record)
 		{
 			Log.AddFrame(record);
 		}
 
-		public void AddFrameAt(string record, int frame)
+		public void InsertFrame(string record, int frame)
 		{
 			Log.AddFrameAt(record, frame);
 		}
diff --git a/BizHawk.MultiClient/movie/MovieConvert.cs b/BizHawk.MultiClient/movie/MovieConvert.cs
index 786d87c136..4674575d47 100644
--- a/BizHawk.MultiClient/movie/MovieConvert.cs
+++ b/BizHawk.MultiClient/movie/MovieConvert.cs
@@ -113,7 +113,7 @@ namespace BizHawk.MultiClient
                 frame += "|";
 
                 r.ReadBytes(3); //Lose remaining controllers for now
-                m.AddFrame(frame);
+                m.AppendFrame(frame);
             }
 
 
@@ -236,7 +236,7 @@ namespace BizHawk.MultiClient
 
                 frame += start;
                 frame += ".|";
-                m.AddFrame(frame);
+                m.AppendFrame(frame);
             }
             m.WriteMovie();
             return m;
diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs
index 6ca43c67d5..8ff9f6b900 100644
--- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs
@@ -354,7 +354,7 @@
             this.toolStripSeparator4});
 			this.toolStrip2.Location = new System.Drawing.Point(3, 25);
 			this.toolStrip2.Name = "toolStrip2";
-			this.toolStrip2.Size = new System.Drawing.Size(62, 25);
+			this.toolStrip2.Size = new System.Drawing.Size(93, 25);
 			this.toolStrip2.TabIndex = 1;
 			// 
 			// StopButton
@@ -375,6 +375,7 @@
 			this.PlayMovieFromBeginning.Size = new System.Drawing.Size(23, 22);
 			this.PlayMovieFromBeginning.Text = "|";
 			this.PlayMovieFromBeginning.ToolTipText = "Rewind to Beginning";
+			this.PlayMovieFromBeginning.Click += new System.EventHandler(this.PlayMovieFromBeginning_Click);
 			// 
 			// toolStripSeparator4
 			// 
diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs
index 5c3b4572a9..d810891a5b 100644
--- a/BizHawk.MultiClient/tools/TAStudio.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.cs
@@ -11,6 +11,10 @@ namespace BizHawk.MultiClient
 {
 	public partial class TAStudio : Form
 	{
+		//TODO:
+		//Right-click - Go to current frame
+		//Clicking a frame should go there
+
 		int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
 		int defaultHeight;
 		
@@ -80,6 +84,7 @@ namespace BizHawk.MultiClient
 
 		private void SaveConfigSettings()
 		{
+			Engaged = false;
 			Global.Config.TASWndx = this.Location.X;
 			Global.Config.TASWndy = this.Location.Y;
 			Global.Config.TASWidth = this.Right - this.Left;
@@ -186,5 +191,10 @@ namespace BizHawk.MultiClient
 			if (Global.MainForm.ReadOnly)
 				return;
 		}
+
+		private void PlayMovieFromBeginning_Click(object sender, EventArgs e)
+		{
+
+		}
 	}
 }
diff --git a/BizHawk.MultiClient/tools/TAStudio.resx b/BizHawk.MultiClient/tools/TAStudio.resx
index 58e7d0174f..8bd8ebb331 100644
--- a/BizHawk.MultiClient/tools/TAStudio.resx
+++ b/BizHawk.MultiClient/tools/TAStudio.resx
@@ -145,9 +145,6 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>324, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>324, 17</value>
-  </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>416, 17</value>
   </metadata>