diff --git a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs
index fe6feb19d7..aa0e1e41d8 100644
--- a/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs
+++ b/BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs
@@ -83,6 +83,11 @@ namespace BizHawk.Client.Common
 			["Button 2"] = '2',
 			["Button 3"] = '3',
 			["Button 4"] = '4',
+			["Button 5"] = '5',
+			["Button 6"] = '6',
+			["Button 7"] = '7',
+			["Button 8"] = '8',
+			["Button 9"] = '9',
 			["B1"] = '1',
 			["B2"] = '2',
 
@@ -434,6 +439,45 @@ namespace BizHawk.Client.Common
 				["NO"] = 'n',
 				["CLR"] = 'c',
 				["ENT"] = 'e'
+			},
+			["MAME"] = new Dictionary<string, char>
+			{
+				["Right Stick/Up"] = 'u',
+				["Right Stick/Down"] = 'd',
+				["Right Stick/Left"] = 'l',
+				["Right Stick/Right"] = 'r',
+				["Left Stick/Up"] = '^',
+				["Left Stick/Down"] = 'v',
+				["Left Stick/Left"] = '<',
+				["Left Stick/Right"] = '>',
+				["Coin 1"] = 'C',
+				["Coin 2"] = 'C',
+				["Coin 3"] = 'C',
+				["Coin 4"] = 'C',
+				["Coin 5"] = 'C',
+				["Coin 6"] = 'C',
+				["Coin 7"] = 'C',
+				["Coin 8"] = 'C',
+				["Coin 9"] = 'C',
+				["1 Player Start"] = '1',
+				["2 Players Start"] = '2',
+				["3 Players Start"] = '3',
+				["4 Players Start"] = '4',
+				["5 Players Start"] = '5',
+				["6 Players Start"] = '6',
+				["7 Players Start"] = '7',
+				["8 Players Start"] = '8',
+				["Service"] = 'S',
+				["Service Mode"] = 'S',
+				["Service 1"] = 's',
+				["Service 2"] = 's',
+				["Service 3"] = 's',
+				["Service 4"] = 's',
+				["Tilt"] = 'T',
+				["Tilt 1"] = 't',
+				["Tilt 2"] = 't',
+				["Tilt 3"] = 't',
+				["Tilt 4"] = 't',
 			}
 		};
 	}
diff --git a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
index ec5ef9305b..c160de5ae8 100644
--- a/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
+++ b/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
@@ -817,7 +817,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 				"local bit_step " +
 				"if     address_shift == 0 then bit_step = data_width " +
 				"elseif address_shift >  0 then bit_step = data_width << address_shift " +
-				"elseif address_shift<  0 then bit_step = 8 " +
+				"elseif address_shift <  0 then bit_step = 8 " +
 				"end " +
 				"return space:read_range(0, 0xfffffff, space.data_width, math.floor(bit_step / 8))";