diff --git a/src/ines.cpp b/src/ines.cpp
index 04d681f9..39b54517 100644
--- a/src/ines.cpp
+++ b/src/ines.cpp
@@ -541,8 +541,8 @@ static BMAPPINGLocal bmap[] = {
 //	{"",					 14, Mapper14_Init},
 	{"100-in-1",			 15, Mapper15_Init},
 	{"Bandai",				 16, Mapper16_Init},
-//	{"",					 17, Mapper17_Init},
-//	{"",					 18, Mapper18_Init},
+	{"",					 17, Mapper17_Init},
+	{"",					 18, Mapper18_Init},
 	{"Namcot 106",			 19, Mapper19_Init},
 //	{"",					 20, Mapper20_Init},
 //	{"",					 21, Mapper21_Init},
@@ -558,7 +558,7 @@ static BMAPPINGLocal bmap[] = {
 //	{"",					 31, Mapper31_Init},
 //	{"",					 32, Mapper32_Init},
 //	{"",					 33, Mapper33_Init},
-//	{"",					 34, Mapper34_Init},
+	{"",					 34, Mapper34_Init},
 	{"Wario Land 2",		 35, UNLSC127_Init}, // Wario Land 2
 	{"TXC Policeman",		 36, Mapper36_Init}, // TXC Policeman
 	{"",					 37, Mapper37_Init},
@@ -606,8 +606,8 @@ static BMAPPINGLocal bmap[] = {
 //	{"",					 79, Mapper79_Init},
 //	{"",					 80, Mapper80_Init},
 //	{"",					 81, Mapper81_Init},
-//	{"",					 82, Mapper82_Init},
-//	{"",					 83, Mapper83_Init},
+	{"",					 82, Mapper82_Init},
+	{"",					 83, Mapper83_Init},
 //	{"",					 84, Mapper84_Init},
 //	{"",					 85, Mapper85_Init},
 	{"",					 86, Mapper86_Init},
@@ -615,15 +615,15 @@ static BMAPPINGLocal bmap[] = {
 	{"",					 88, Mapper88_Init},
 	{"",					 89, Mapper89_Init},
 	{"",					 90, Mapper90_Init},
-//	{"",					 91, Mapper91_Init},
+	{"",					 91, Mapper91_Init},
 	{"",					 92, Mapper92_Init},
 	{"Sunsoft UNROM",		 93, SUNSOFT_UNROM_Init},
 	{"",					 94, Mapper94_Init},
 	{"",					 95, Mapper95_Init},
-//	{"",					 96, Mapper96_Init},
+	{"",					 96, Mapper96_Init},
 	{"",					 97, Mapper97_Init},
 //	{"",					 98, Mapper98_Init},
-//	{"",					 99, Mapper99_Init},
+	{"",					 99, Mapper99_Init},
 //	{"",					100, Mapper100_Init},
 	{"",					101, Mapper101_Init},
 //	{"",					102, Mapper102_Init},
@@ -649,7 +649,7 @@ static BMAPPINGLocal bmap[] = {
 //	{"",					122, Mapper122_Init},
 	{"UNLH2288",			123, UNLH2288_Init},
 //	{"",					124, Mapper124_Init},
-//	{"",					125, LH32_Init},
+	{"",					125, LH32_Init},
 //	{"",					126, Mapper126_Init},
 //	{"",					127, Mapper127_Init},
 //	{"",					128, Mapper128_Init},
@@ -675,12 +675,12 @@ static BMAPPINGLocal bmap[] = {
 	{"SA0037",				148, SA0037_Init},
 	{"SA0036",				149, SA0036_Init},
 	{"S74LS374N",			150, S74LS374N_Init},
-//	{"",					151, Mapper151_Init},
+	{"",					151, Mapper151_Init},
 	{"",					152, Mapper152_Init},
 	{"",					153, Mapper153_Init},
 	{"",					154, Mapper154_Init},
 	{"",					155, Mapper155_Init},
-//	{"",					156, Mapper156_Init},
+	{"",					156, Mapper156_Init},
 	{"",					157, Mapper157_Init},
 //	{"",					158, Mapper158_Init},
 //	{"",					159, Mapper159_Init},
@@ -692,9 +692,9 @@ static BMAPPINGLocal bmap[] = {
 	{"",					165, Mapper165_Init},
 //	{"",					166, Mapper166_Init},
 //	{"",					167, Mapper167_Init},
-//	{"",					168, Mapper168_Init},
+	{"",					168, Mapper168_Init},
 //	{"",					169, Mapper169_Init},
-//	{"",					170, Mapper170_Init},
+	{"",					170, Mapper170_Init},
 	{"",					171, Mapper171_Init},
 	{"",					172, Mapper172_Init},
 	{"",					173, Mapper173_Init},
@@ -717,7 +717,7 @@ static BMAPPINGLocal bmap[] = {
 //	{"",					190, Mapper190_Init},
 	{"",					191, Mapper191_Init},
 	{"",					192, Mapper192_Init},
-//	{"",					193, Mapper193_Init},
+	{"",					193, Mapper193_Init},
 	{"",					194, Mapper194_Init},
 	{"",					195, Mapper195_Init},
 	{"",					196, Mapper196_Init},
@@ -749,7 +749,7 @@ static BMAPPINGLocal bmap[] = {
 	{"",					222, Mapper222_Init},
 //	{"",					223, Mapper223_Init},
 //	{"",					224, Mapper224_Init},
-//	{"",					225, Mapper225_Init},
+	{"",					225, Mapper225_Init},
 	{"",					226, Mapper226_Init},
 	{"",					227, Mapper227_Init},
 //	{"",					228, Mapper228_Init},
diff --git a/src/unif.cpp b/src/unif.cpp
index 6ce57af1..243f4b99 100644
--- a/src/unif.cpp
+++ b/src/unif.cpp
@@ -317,7 +317,7 @@ static int LoadCHR(FCEUFILE *fp)
 
 static BMAPPING bmap[] = {
 
-//	{ "12-IN-1",BMC12IN1_Init,0},
+	{ "12-IN-1",BMC12IN1_Init,0},
 	{ "13in1JY110", BMC13in1JY110_Init, 0},
 	{ "190in1", BMC190in1_Init, 0},
 	{ "22211", UNL22211_Init,0},
@@ -335,10 +335,10 @@ static BMAPPING bmap[] = {
 	{ "8237A", UNL8237A_Init,0},
 	{ "830118C",BMC830118C_Init, 0},
 	{ "A65AS", BMCA65AS_Init,0},
-//	{ "AC08", AC08_Init,0},
+	{ "AC08", AC08_Init,0},
 	{ "ANROM", ANROM_Init,0},
 	{ "AX5705", UNLAX5705_Init, 0},
-//	{ "BB", UNLBB_Init,0},
+	{ "BB", UNLBB_Init,0},
 	{ "BS-5",BMCBS5_Init, 0},
 	{ "CC-21", UNLCC21_Init,0},
 	{ "CITYFIGHT", UNLCITYFIGHT_Init, 0},
@@ -346,7 +346,7 @@ static BMAPPING bmap[] = {
 	{ "CPROM", CPROM_Init,BMCFLAG_16KCHRR},
 	{ "D1038", BMCD1038_Init, 0},
 	{ "DANCE", UNLOneBus_Init,0}, // redundant
-//	{ "DANCE2000", UNLD2000_Init,0},
+	{ "DANCE2000", UNLD2000_Init,0},
 	{ "DREAMTECH01", DreamTech01_Init,0},
 	{ "EDU2000", UNLEDU2000_Init,0},
 	{ "EKROM", EKROM_Init,0},
@@ -364,18 +364,18 @@ static BMAPPING bmap[] = {
 	{ "HKROM", HKROM_Init,0},
 	{ "KOF97", UNLKOF97_Init,0},
 	{ "KONAMI-QTAI", Mapper190_Init,0},
-//	{ "KS7012", UNLKS7012_Init, 0},
-//	{ "KS7013B", UNLKS7013B_Init, 0},
-//	{ "KS7017", UNLKS7017_Init, 0},
-//	{ "KS7030", UNLKS7030_Init, 0},
-//	{ "KS7031", UNLKS7031_Init, 0},
+	{ "KS7012", UNLKS7012_Init, 0},
+	{ "KS7013B", UNLKS7013B_Init, 0},
+	{ "KS7017", UNLKS7017_Init, 0},
+	{ "KS7030", UNLKS7030_Init, 0},
+	{ "KS7031", UNLKS7031_Init, 0},
 	{ "KS7032", UNLKS7032_Init, 0},
-//	{ "KS7037", UNLKS7037_Init, 0},
+	{ "KS7037", UNLKS7037_Init, 0},
 	{ "KS7057", UNLKS7057_Init, 0},
-//	{ "LE05", LE05_Init,0},
-//	{ "LH10", LH10_Init,0},
-//	{ "LH32", LH32_Init,0},
-//	{ "LH53", LH53_Init,0},
+	{ "LE05", LE05_Init,0},
+	{ "LH10", LH10_Init,0},
+	{ "LH32", LH32_Init,0},
+	{ "LH53", LH53_Init,0},
 	{ "MARIO1-MALEE2", MALEE_Init,0},
 	{ "MHROM", MHROM_Init,0},
 	{ "N625092", UNLN625092_Init,0},
@@ -386,7 +386,7 @@ static BMAPPING bmap[] = {
 	{ "NTD-03", BMCNTD03_Init,0},
 	{ "NovelDiamond9999999in1", Novel_Init,0},
 	{ "OneBus", UNLOneBus_Init,0},
-//	{ "PEC-586",UNLPEC586Init,0},
+	{ "PEC-586",UNLPEC586Init,0},
 	{ "RROM", NROM_Init,0 },
 	{ "RROM-128", NROM_Init,0 },
 	{ "SA-002", TCU02_Init, 0},
@@ -396,7 +396,7 @@ static BMAPPING bmap[] = {
 	{ "SA-016-1M", SA0161M_Init,0},
 	{ "SA-72007", SA72007_Init,0},
 	{ "SA-72008", SA72008_Init,0},
-//	{ "SA-9602B", SA9602B_Init, BMCFLAG_32KCHRR},
+	{ "SA-9602B", SA9602B_Init, BMCFLAG_32KCHRR},
 	{ "SA-NROM", TCA01_Init,0},
 	{ "SAROM", SAROM_Init,0},
 	{ "SBROM", SBROM_Init,0},
@@ -413,7 +413,7 @@ static BMAPPING bmap[] = {
 	{ "SMB2J", UNLSMB2J_Init, 0},
 	{ "SNROM", SNROM_Init,0},
 	{ "SOROM", SOROM_Init,0},
-//	{ "SSS-NROM-256", SSSNROM_Init,0 },
+	{ "SSS-NROM-256", SSSNROM_Init,0 },
 	{ "SUNSOFT_UNROM", SUNSOFT_UNROM_Init,0},
 	{ "Sachen-74LS374N", S74LS374N_Init,0},
 	{ "Sachen-74LS374NA", S74LS374NA_Init,0}, //seems to be custom mapper
@@ -442,11 +442,11 @@ static BMAPPING bmap[] = {
 	{ "TR1ROM", TFROM_Init,BMCFLAG_FORCE4},
 	{ "TSROM", TSROM_Init,0},
 	{ "TVROM", TLROM_Init,BMCFLAG_FORCE4},
-//	{ "Transformer", Transformer_Init, 0},
+	{ "Transformer", Transformer_Init, 0},
 	{ "UNROM", UNROM_Init,0},
 	{ "UOROM", UNROM_Init,0},
-//	{ "VRC7", UNLVRC7_Init,0},
-//	{ "YOKO", UNLYOKO_Init,0},
+	{ "VRC7", UNLVRC7_Init,0},
+	{ "YOKO", UNLYOKO_Init,0},
 
 	{0,0,0}
 };
diff --git a/vc/vc8_fceux.vcproj b/vc/vc8_fceux.vcproj
index ed970dc5..4a01ad4b 100644
--- a/vc/vc8_fceux.vcproj
+++ b/vc/vc8_fceux.vcproj
@@ -585,26 +585,38 @@
 				RelativePath="..\src\boards\121.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\12in1.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\15.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\mappers\156.cpp"
+				RelativePath="..\src\boards\151.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\156.cpp"
 				>
-				<FileConfiguration
-					Name="Release Fastbuild|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\boards\164.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\168.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\17.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\170.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\175.cpp"
 				>
@@ -625,6 +637,10 @@
 				RelativePath="..\src\boards\179.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\18.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\183.cpp"
 				>
@@ -645,6 +661,10 @@
 				RelativePath="..\src\boards\189.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\193.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\199.cpp"
 				>
@@ -657,6 +677,10 @@
 				RelativePath="..\src\boards\222.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\225.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\23.cpp"
 				>
@@ -723,6 +747,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\boards\34.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\3d-block.cpp"
 				>
@@ -751,6 +779,10 @@
 				RelativePath="..\src\boards\8157.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\82.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\8237.cpp"
 				>
@@ -767,10 +799,22 @@
 				RelativePath="..\src\boards\90.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\91.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\95.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\96.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\99.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\__dummy_mapper.cpp"
 				>
@@ -779,6 +823,10 @@
 				RelativePath="..\src\boards\a9746.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\ac-08.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\addrlatch.cpp"
 				>
@@ -791,6 +839,10 @@
 				RelativePath="..\src\boards\bandai.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\bb.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\bmc13in1jy110.cpp"
 				>
@@ -815,6 +867,14 @@
 				RelativePath="..\src\boards\bs-5.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\cityfighter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\dance2000.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\datalatch.cpp"
 				>
@@ -831,6 +891,10 @@
 				RelativePath="..\src\boards\edu2000.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\famicombox.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\fk23c.cpp"
 				>
@@ -863,10 +927,50 @@
 				RelativePath="..\src\boards\konami-qtai.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\ks7012.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\ks7013.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\ks7017.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\ks7030.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\ks7031.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\ks7032.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\ks7037.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\ks7057.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\le05.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\lh32.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\lh53.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\malee.cpp"
 				>
@@ -903,6 +1007,14 @@
 				RelativePath="..\src\boards\onebus.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\pec-586.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\sa-9602b.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\boards\sachen.cpp"
 				>
@@ -951,6 +1063,18 @@
 				RelativePath="..\src\boards\tf-1201.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\boards\transformer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\vrc7.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\boards\yoko.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="drivers"
@@ -4000,54 +4124,10 @@
 		<Filter
 			Name="mappers"
 			>
-			<File
-				RelativePath="..\src\mappers\151.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\17.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\18.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\193.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\201.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\202.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\203.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\204.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\21.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\212.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\213.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\214.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\215.cpp"
 				>
@@ -4060,30 +4140,14 @@
 				RelativePath="..\src\mappers\22.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\225.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\227.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\228.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\229.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\230.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\231.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\232.cpp"
 				>
@@ -4092,14 +4156,6 @@
 				RelativePath="..\src\mappers\234.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\241.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\242.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\244.cpp"
 				>
@@ -4156,10 +4212,6 @@
 				RelativePath="..\src\mappers\51.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\59.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\6.cpp"
 				>
@@ -4216,50 +4268,14 @@
 				RelativePath="..\src\mappers\79.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\8.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\80.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\82.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\83.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\85.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\86.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\89.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\91.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\92.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\97.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mappers\99.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\emu2413.c"
 				>
@@ -4337,10 +4353,6 @@
 				RelativePath="..\src\mappers\mmc2and4.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\mappers\simple.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\mappers\vrc7tone.h"
 				>