diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.cs b/BizHawk.Emulation/Computers/Commodore64/C64.cs
index d7c163e94d..4464717ade 100644
--- a/BizHawk.Emulation/Computers/Commodore64/C64.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/C64.cs
@@ -45,6 +45,8 @@ namespace BizHawk.Emulation.Computers.Commodore64
 		public void ResetFrameCounter()
 		{
 			_frame = 0;
+			_lagcount = 0;
+			_islag = false;
 		}
 
 		// audio/video
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
index 96cf6445e5..aa83349996 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
@@ -33,6 +33,8 @@ namespace BizHawk
 		public void ResetFrameCounter()
 		{
 			_frame = 0;
+			_lagcount = 0;
+			_islag = false;
 		}
 
 		public static readonly ControllerDefinition Atari2600ControllerDefinition = new ControllerDefinition
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
index aff1e8b9e6..61f8557df8 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
@@ -63,6 +63,8 @@ namespace BizHawk
 		public void ResetFrameCounter()
 		{
 			_frame = 0;
+			_lagcount = 0;
+			_islag = false;
 		}
 
 		public byte[] SaveStateBinary()
diff --git a/BizHawk.Emulation/Consoles/Calculator/TI83.cs b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
index 31935d34fa..ae9f7a3b99 100644
--- a/BizHawk.Emulation/Consoles/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Consoles/Calculator/TI83.cs
@@ -484,6 +484,8 @@ namespace BizHawk.Emulation.Consoles.Calculator
 		public void ResetFrameCounter()
 		{
 			Frame = 0;
+			_lagcount = 0;
+			islag = false;
 		}
 
 		public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
diff --git a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
index 57928d95ea..8bf6154b27 100644
--- a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
@@ -233,7 +233,12 @@ namespace BizHawk.Emulation.Consoles.Coleco
 		}
 
 		public void Dispose() { }
-		public void ResetFrameCounter() { }
+		public void ResetFrameCounter()
+		{
+			Frame = 0;
+			_lagcount = 0;
+			islag = false;
+		}
 
 		public string SystemId { get { return "Coleco"; } }
 		public GameInfo game;
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
index 2f72487332..cbb10567ba 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
@@ -132,6 +132,9 @@ namespace BizHawk.Emulation.Consoles.Intellivision
 
 		public void ResetFrameCounter()
 		{
+			Frame = 0;
+			LagCount = 0;
+			IsLagFrame = false;
 		}
 
 		public void SaveStateText(TextWriter writer)
diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
index d8e0133456..e34c10a205 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
@@ -58,6 +58,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.GBA
 		{
 			Frame = 0;
 			LagCount = 0;
+			IsLagFrame = false;
 		}
 
 		#region saveram
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
index 88d7f86d9d..304a936ce8 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -289,9 +289,9 @@ namespace BizHawk.Emulation.Consoles.GB
 
 		public void ResetFrameCounter()
 		{
-			// is this right?
 			Frame = 0;
 			LagCount = 0;
+			IsLagFrame = false;
 		}
 
 		#region savestates
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
index 0f0e21b3e4..a40b15aa08 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
@@ -320,6 +320,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		public void ResetFrameCounter()
 		{
 			_frame = 0;
+			_lagcount = 0;
+			islag = false;
 		}
 
 		public long Timestamp { get; private set; }
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
index 8a0f971e47..3ae795790a 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
@@ -196,9 +196,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
 			CGWSEL_COLORSUBMASK = 41,
 			CGWSEL_ADDSUBMODE = 42,
 			CGWSEL_DIRECTCOLOR = 43,
-			//$2101 OBSEL
-			OBSEL_NAMEBASE = 50,
-			OBSEL_NAMESEL = 51,
+			//$2101 OBSEL
+			OBSEL_NAMEBASE = 50,
+			OBSEL_NAMESEL = 51,
 			OBSEL_SIZE = 52,
 		}
 
@@ -734,7 +734,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
 			StoreSaveRam(cleardata);
 		}
 
-		public void ResetFrameCounter() { timeFrameCounter = 0; }
+		public void ResetFrameCounter()
+		{
+			timeFrameCounter = 0;
+			LagCount = 0;
+			IsLagFrame = false;
+		}
 
 		#region savestates
 
diff --git a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs
index 44c4bf71ab..1d480c40e2 100644
--- a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs	
@@ -236,6 +236,8 @@ namespace BizHawk.Emulation.Consoles.TurboGrafx
 		{
 			// this should just be a public setter instead of a new method.
 			Frame = 0;
+			_lagcount = 0;
+			islag = false;
 		}
 
 		public void FrameAdvance(bool render, bool rendersound)
diff --git a/BizHawk.Emulation/Consoles/PSX/Octoshock.cs b/BizHawk.Emulation/Consoles/PSX/Octoshock.cs
index e20141cc9e..efbcdb4972 100644
--- a/BizHawk.Emulation/Consoles/PSX/Octoshock.cs
+++ b/BizHawk.Emulation/Consoles/PSX/Octoshock.cs
@@ -204,7 +204,10 @@ namespace BizHawk.Emulation.Consoles.PSX
 
 		public void ResetFrameCounter()
 		{
+			// FIXME when all this stuff is implemented
 			Frame = 0;
+			LagCount = 0;
+			//IsLagFrame = false;
 		}
 
 		public void FrameAdvance(bool render, bool rendersound)
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
index 6c24831c1a..ce1cbf4e99 100644
--- a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
+++ b/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
@@ -38,6 +38,8 @@ namespace BizHawk.Emulation.Consoles.Sega
 		public void ResetFrameCounter()
 		{
 			Frame = 0;
+			_lagcount = 0;
+			islag = false;
 		}
 
 		// Genesis timings:
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
index 3f0619de28..c90ab8fb26 100644
--- a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
+++ b/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
@@ -67,6 +67,8 @@ namespace BizHawk.Emulation.Consoles.Sega
 		public void ResetFrameCounter()
 		{
 			Frame = 0;
+			_lagcount = 0;
+			islag = false;
 		}
 		
 		public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
diff --git a/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs b/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs
index 3e403a0eeb..eb4be92c0c 100644
--- a/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs	
+++ b/BizHawk.Emulation/Interfaces/Base Implementations/NullEmulator.cs	
@@ -30,6 +30,7 @@ namespace BizHawk
 		public void ResetFrameCounter()
 		{
 			Frame = 0;
+			// no lag frames on this stub core
 		}
 
 		public void FrameAdvance(bool render, bool rendersound)