diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
index c9fdcec532..9973baa567 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
@@ -276,8 +276,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				if (!reg_2000.vblank_nmi_gen & ((value & 0x80) != 0) && (Reg2002_vblank_active))
 				{
 					//if we just unleashed the vblank interrupt then activate it now
-					//TriggerNMI2();
-					Debug.Assert(false);
+					//FCEUX would use a "trigger NMI2" here. why?? why isn't a regular NMI good enough?
+					TriggerNMI();
 				}
 				reg_2000.Value = value;
 			}
diff --git a/BizHawk.Emulation/Database/Database.cs b/BizHawk.Emulation/Database/Database.cs
index 9c47ec38fd..194e66ebf7 100644
--- a/BizHawk.Emulation/Database/Database.cs
+++ b/BizHawk.Emulation/Database/Database.cs
@@ -62,6 +62,7 @@ namespace BizHawk
                     string line = reader.ReadLine();
                     try
                     {
+						if (line.StartsWith(";")) continue; //comment
                         if (line.Trim().Length == 0) continue;
                         string[] items = line.Split('\t');
 
diff --git a/BizHawk.MultiClient/output/gamedb.txt b/BizHawk.MultiClient/output/gamedb.txt
index 240aaf0466..b464a2342a 100644
--- a/BizHawk.MultiClient/output/gamedb.txt
+++ b/BizHawk.MultiClient/output/gamedb.txt
@@ -2258,7 +2258,6 @@ B486A8ED		Dai Makai Mura	SGX
 
 D4448D09BBFDE687C04F9E3310E023AB		ti83_1.rom	TI83		initPC=6ce
 
-8E3630186E35D477231BF8FD50E54CDD		Super Mario Bros. (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
 1457475741846A01399DC663135A60C1		Balloon Fight (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
 576AB245B4F04C670AC312AB0D441697		Baseball (UE)	NES		board=NROM;mirror=H;PRG=1;CHR=1
 0F9C8D3D3099C70368411F6DF9EF49C1		Bomberman (U)	NES		board=NROM;mirror=V;PRG=1;CHR=1
@@ -2270,3 +2269,55 @@ A2B5BDDB4C7A5A39C8FAC13E64494C9A		Donkey Kong 3 (JUE)		board=NROM;mirror=V;PRG=1
 8B7C1E5B55A9E5FA23E895DF2D682914		Donkey Kong Jr (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
 1CA706896A8D4F2A2B5480D941130A4A		Donkey Kong Jr Math (U)	NES		board=NROM;mirror=V;PRG=1;CHR=1
 FA382374EB4A93A719064CA6C5A4E78C		Duck Hunt (JUE)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+9B0727E0ADB0A7B4F94E072B7CF28A5A		Excitebike (JU)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+7915989354F8B96E10AA4A6D0E163C55		Golf (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+DEE8757582E0575C5F729AAE60B1DCBB		Hogan's Alley (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+C9C94DF2EBB19BD6D717B2CFBF977574		Ice Climber (U)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+BEFD5D05EB33F984994230546C2BCFA3		Lode Runner (U)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+789EE538B73E401809FF3926B8871845		Lunar Pool (U)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+B51085D9AB4267746A9ED6FC609A98D0		Mario Bros (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+F511C234F8B945AE885DADA03228BCD6		Millipede (U)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+C7E5668FB42BB51D7E438A1BA47A4E85		MUSCLE (U)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+CA606BD8A875A396D52735C3BB84FA67		Pac-Man (Namco) (U)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+C4AE6CC4E981A8316429572409018DC8		Pac-Man (U)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+1A860B28AD960DFD700B066924341EDB		Pac-Man (Unlicensed) (U)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+AD809323FE92D0E083BF77CCECAE462E		Pinball (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+170ADB71CBBAA754008345D623EB804C		Popeye (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1
+472E4F023B0DCCEDD343A046679710FE		Pyramid (U)	NES		board=NROM;mirror=H;PRG=1;CHR=1;bug=1
+B0F0B0CC14958D30E89D06AF182E7CD5		Raid on Bungeling Bay (U)	NES		board=NROM;mirror=V;PRG=1;CHR=1;bug=1
+32A5E44B320AE588F560196E49BA13C6		Tennis (JU)	NES		board=NROM;mirror=H;PRG=1;CHR=1;
+CB7F1463C90CDCDF5EF315C125F12FE2		Urban Champion (JU)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+4635D8D82A86E8B99390A0586C96D536		Wild Gunman (JUE)	NES		board=NROM;mirror=V;PRG=1;CHR=1
+
+BD2C15391B0641D43A35E83F5FCE073A		10-Yard Fight (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+0B66FDF88964235C434DAFF62837AF60		1942 (JU)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+4B3B120FA98DCAE25FA88B29818572F8		Chubby Cherub (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+328B2C34D156E1C310495AEBB7BF987C		Dig Dug 2 (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1;bug=1
+370F5862746B67637087B3B4CD64B163		Elevator Action (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+52485AD0D6AACA08BE2C1BD4C855A080		Galaga (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+5195D1381E082D307FE62AA4D73C488B		Gyromite (JUE)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+3DF2BFDD6F134D637F6F16F0AE3FFCF7		Hydlide (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+51BE3C0DB685F71F4A69C573345310A2		Ice Hockey (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+08B21D774B2ADAED5480F6A941C576E4		Kung Fu (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+70648D346F902E599F943963667F65CE		Mach Rider (Alt) (JU)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+0256E02693147FAD9383190528FF0576		Mach Rider (JU)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+BCFC31B4F72A94946580AC3E68CE9F97		Magmax (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+B7F24E66A7DF5D102023977AB887D97E		Ms Pac-Man (Namco) (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+05A599D5E76C5820F6C18D10E67448E5		Ms Pac-Man (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+1601FE20AE57415C9CE76481F2FA2389		Othello (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1;bug=1
+1E24273E31739910AFE602515FB22AD8		Seicross (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+4D9A6662FD870A684B327046D0F13C60		Slalom (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+01E5E40688BDD0E4073F366D4ECA9E40		Soccer (JU)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+C7538FE4132AADC1A2535042C6BBF29C		Spelunker (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+22F4719A16FCF0DEFE1DF7F4C6C7D83D		Spy Vs Spy (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+96250E185FF5B8C596A210803484322E		Sqoon (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+80F94BBB851A5466BF773DBBC6D056F2		Stack-Up (JU)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+8E3630186E35D477231BF8FD50E54CDD		Super Mario Bros (Rev 0) (JU)	NES		board=NROM;mirror=V;PRG=2;CHR=1;bug=1
+D7176817CDE28CE3F6589B5E833089A4		Super Mario Bros (Rev 1) (JU)	NES		board=NROM;mirror=V;PRG=2;CHR=1;bug=1
+FA57750AD33815E99C40986F26FC697E		Tag Team Wrestling (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1;
+7A471AC3E9F2ED9B252C0EE6C5B69F5B		Volleyball (U)	NES		board=NROM;mirror=V;PRG=2;CHR=1
+E7D7225DAD044B624FBAD9C9CA96E835		Wrecking Crew (JUE)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+7A528FA727623BA7704FDBB519F3419F		Xevious (U)	NES		board=NROM;mirror=H;PRG=2;CHR=1
+
+;todo videomation(mapper13)
+;starting at arkanoid we have mappers
\ No newline at end of file