diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 1cf836ce8b..98ab59ce9e 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -660,6 +660,7 @@ namespace BizHawk.MultiClient
 				}
 
                 //TODO: autoload movie logic goes here
+                InputLog.SetHeaderLine(MovieHeader.PLATFORM, Global.Emulator.SystemId);
                 InputLog.StartNewRecording(); //(Keep this line)
                 
 				//setup the throttle based on platform's specifications
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index bcd69bdded..21574f6d88 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -330,5 +330,10 @@ namespace BizHawk.MultiClient
             if (MovieMode == MOVIEMODE.PLAY)
                 MovieMode = MOVIEMODE.FINISHED;
         }
+
+        public bool SetHeaderLine(string key, string value)
+        {
+            return Header.SetHeaderLine(key, value);
+        }
     }
 }
diff --git a/BizHawk.MultiClient/movie/MovieHeader.cs b/BizHawk.MultiClient/movie/MovieHeader.cs
index 14807eb6d1..5912ab6b82 100644
--- a/BizHawk.MultiClient/movie/MovieHeader.cs
+++ b/BizHawk.MultiClient/movie/MovieHeader.cs
@@ -16,13 +16,13 @@ namespace BizHawk.MultiClient
 
         public Dictionary<string, string> HeaderParams = new Dictionary<string, string>(); //Platform specific options go here
         public List<string> Comments = new List<string>();
-        
-        public const string EMULATIONVERSION = "EmulationVersion";
+
+        public const string EMULATIONVERSION = "emuVersion";
         public const string MOVIEVERSION = "MovieVersion";
         public const string PLATFORM = "Platform";
         public const string GAMENAME = "GameName";
         public const string AUTHOR = "Author";
-        public const string RERECORDS = "Rerecords";
+        public const string RERECORDS = "rerecordCount";
 
         public static string MovieVersion = "BizHawk v0.0.1";
 
@@ -51,7 +51,7 @@ namespace BizHawk.MultiClient
         /// </summary>
         /// <param name="key"></param>
         /// <param name="value"></param>
-        public void AddHeaderLine(string key, string value) //TODO: check for redundancy and return bool?
+        public void AddHeaderLine(string key, string value)
         {
             string temp = value;
             
@@ -61,7 +61,7 @@ namespace BizHawk.MultiClient
 
         public void UpdateRerecordCount(int count)
         {
-            //TODO
+            HeaderParams[RERECORDS] = count.ToString();
         }
 
         public bool RemoveHeaderLine(string key)
@@ -80,5 +80,16 @@ namespace BizHawk.MultiClient
             HeaderParams.TryGetValue(key, out value);
             return value;
         }
+
+        public bool SetHeaderLine(string key, string value)
+        {
+            string test = "";
+            if (!(HeaderParams.TryGetValue(test, out value)))
+                return false;
+
+            HeaderParams[key] = value;
+
+            return true;
+        }
     }
 }