diff --git a/includes/remapping.php b/includes/remapping.php
index c1221e7..db9484a 100644
--- a/includes/remapping.php
+++ b/includes/remapping.php
@@ -49,7 +49,7 @@ $mapping_mame = array (
 		"apollo_ctape" => "Hewlett-Packard - Apollo",
 		"apple1" => "Apple - I",
 		"apple2" => "Apple - II",
-		"apple2gs" => "Apple  - II",
+		"apple2gs" => "Apple - II",
 		"apple3" => "Apple - III",
 		"aquarius" => "Mattel - Aquarius",
 		"arcadia" => "Emerson - Arcadia 2001",
@@ -135,11 +135,11 @@ $mapping_mame = array (
 		"einstein" => "Tatung - Einstein TC-01",
 		"electron_cart" => "Acorn - BBC, Electron",
 		"electron_cass" => "Acorn - BBC, Electron",
-		"ep64_cart" => "Enterprise - 64",
-		"ep64_cass" => "Enterprise - 64",
-		"ep64_flop" => "Enterprise - 64",
+		"ep64_cart" => "Enterprise - 64, 128",
+		"ep64_cass" => "Enterprise - 64, 128",
+		"ep64_flop" => "Enterprise - 64, 128",
 		"epson_cpm" => "Epson - CPM",
-		"exl100" => "Exelvision Exeltel, EXL100",
+		"exl100" => "Exelvision - Exeltel, EXL100",
 		"famicom_cass" => "Nintendo - Famicom BASIC",
 		"famicom_flop" => "Nintendo - Famicom Disk System",
 		"fidel_scc" => "Fidelity - SCC",
@@ -148,7 +148,7 @@ $mapping_mame = array (
 		"fm7_disk" => "Fujitsu - FM-7",
 		"fmtowns_cd" => "Fujitsu - FM Towns",
 		"g7400" => "Philips - Videopac+, Odyssey2",
-		"galaxy" => "Galaksija  - Galaksija, Galaksija Plus",
+		"galaxy" => "Galaksija - Galaksija, Galaksija Plus",
 		"gamate" => "Bit Corp - Gamate",
 		"gameboy" => "Nintendo - Game Boy",
 		"gamecom" => "Tiger Electronics - Game.com",
@@ -202,7 +202,7 @@ $mapping_mame = array (
 		"leapster" => "LeapFrog - Leapster Learning Game System",
 		"lisa" => "Apple - Lisa",
 		"lisa2" => "Apple - Lisa 2",
-		"lviv" => "Lviv  - PC-01",
+		"lviv" => "Lviv - PC-01",
 		"lynx" => "Atari - Lynx",
 		"m20" => "Olivetti - M20",
 		"m5_cart" => "Sord - M5",
@@ -245,7 +245,7 @@ $mapping_mame = array (
 		"mz2000_flop" => "Sharp - MZ-2000",
 		"mz2500" => "Sharp - MZ-2500",
 		"mz700_cass" => "Sharp - MZ-700",
-		"mz800_cass" => "Sharp - MZ-800, M-1500",
+		"mz800_cass" => "Sharp - MZ-800, MZ-1500",
 		"n64" => "Nintendo - Nintendo 64",
 		"n64dd" => "Nintendo - Nintendo 64DD",
 		"nascom_flop" => "Nascom - I, II",
@@ -342,10 +342,10 @@ $mapping_mame = array (
 		"sgx" => "NEC - Super Grafx",
 		"smc777" => "Sony - SMC777",
 		"sms" => "Sega - Master System, Mark III",
-		"snes" => "Nintendo  - Super Nintendo Entertainment System",
-		"snes_bspack" => "Nintendo  - Super Nintendo Entertainment System",
-		"snes_strom" => "Nintendo  - Super Nintendo Entertainment System",
-		"snes_vkun" => "Nintendo  - Super Nintendo Entertainment System",
+		"snes" => "Nintendo - Super Nintendo Entertainment System",
+		"snes_bspack" => "Nintendo - Super Nintendo Entertainment System",
+		"snes_strom" => "Nintendo - Super Nintendo Entertainment System",
+		"snes_vkun" => "Nintendo - Super Nintendo Entertainment System",
 		"snotec" => "Bandai - Super Note Club",
 		"snread" => "Texas Instruments - Speak & Read",
 		"snspell" => "Texas Instruments - Speak & Spell",
@@ -374,7 +374,7 @@ $mapping_mame = array (
 		"svi318_flop" => "Spectravideo - SVI-318, SVI-328",
 		"svision" => "Watara - Supervision",
 		"svmu" => "Sega - Visual Memory System",
-		"tandy200" => "Tandy Radio Shack - Model 200",
+		"tandy200" => "Tandy Radio Shack - TRS-80 Model 200",
 		"tandy2k" => "Tandy Radio Shack - 2000",
 		"tandy6k" => "Tandy Radio Shack - 6000",
 		"tdv2324" => "Tandberg - TDV 2324",
@@ -402,7 +402,7 @@ $mapping_mame = array (
 		"vc4000" => "Interton - VC 4000",
 		"vector06_cart" => "Temirazov & Sokolov - Vector-06C",
 		"vectrex" => "GCE - Vectrex",
-		"vg5k" => "Philips - VG-5000",
+		"vg5k" => "Philips - VG 5000",
 		"vic10" => "Commodore - VIC-10",
 		"vic1001_cart" => "Commodore - VIC-20",
 		"vic1001_cass" => "Commodore - VIC-20",