diff --git a/src/boards/158B.c b/src/boards/158B.c
index b33410c..8bd0f5d 100644
--- a/src/boards/158B.c
+++ b/src/boards/158B.c
@@ -67,5 +67,5 @@ void UNL158B_Init(CartInfo *info) {
 	GenMMC3_Init(info, 128, 128, 0, 0);
 	pwrap = UNL158BPW;
 	info->Power = UNL158BPower;
-	AddExState(EXPREGS, 6, 0, "EXPR");
+	AddExState(EXPREGS, 8, 0, "EXPR");
 }
diff --git a/src/boards/164.c b/src/boards/164.c
index 105b832..7516945 100644
--- a/src/boards/164.c
+++ b/src/boards/164.c
@@ -137,7 +137,7 @@ static DECLFW(Write2) {
 			trigger ^= 1;
 		}
 		laststrobe = V;
-	} else if (A == 0x5100 && V == 6) /* damn thoose protected games */
+	} else if (A == 0x5100 && V == 6) /* damn those protected games */
 		setprg32(0x8000, 3);
 	else
 		switch (A & 0x7300) {
diff --git a/src/boards/168.c b/src/boards/168.c
index 751f0b1..658b6bf 100644
--- a/src/boards/168.c
+++ b/src/boards/168.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * RacerMate Chalenge II
+ * RacerMate Challenge II
  *
  */
 
@@ -58,7 +58,7 @@ static void M168Power(void) {
 	SetReadHandler(0x8000, 0xFFFF, CartBR);
 }
 
-static void MNNNClose(void) {
+static void M168Close(void) {
 	if (CHRRAM)
 		FCEU_gfree(CHRRAM);
 	CHRRAM = NULL;
@@ -70,7 +70,7 @@ static void StateRestore(int version) {
 
 void Mapper168_Init(CartInfo *info) {
 	info->Power = M168Power;
-	info->Close = MNNNClose;
+	info->Close = M168Close;
 	GameStateRestore = StateRestore;
 	AddExState(&StateRegs, ~0, 0, 0);
 
diff --git a/src/boards/BMW8544.c b/src/boards/BMW8544.c
index 0ace160..4f13887 100644
--- a/src/boards/BMW8544.c
+++ b/src/boards/BMW8544.c
@@ -57,10 +57,10 @@ static DECLFR(UNLBMW8544ProtRead) {
 		if(!(A & 1)) {
 			if((EXPREGS[0] & 0xE0) == 0xC0) {
 				EXPREGS[1] = ARead[0x6a](0x6a);	/* program can latch some data from the BUS, but I can't say how exactly, */
-			} else {							/* without more euipment and skills ;) probably here we can try to get any write */
+			} else {							/* without more equipment and skills ;) probably here we can try to get any write */
 				EXPREGS[2] = ARead[0xff](0xff);	/* before the read operation */
 			}
-			FixMMC3CHR(MMC3_cmd & 0x7F);		/* there are more different behaviour of the board isn't used by game itself, so unimplemented here and */
+			FixMMC3CHR(MMC3_cmd & 0x7F);		/* there are more different behaviour of the board that's not used by game itself, so unimplemented here and */
 		}										/* actually will break the current logic ;) */
 	}
 	return 0;
diff --git a/src/boards/bonza.c b/src/boards/bonza.c
index 6ea96f8..c7cb458 100644
--- a/src/boards/bonza.c
+++ b/src/boards/bonza.c
@@ -82,9 +82,9 @@ _MANAGE_CHANNEL:     .BYTE   0,$70,  0,  0,  8
 byte_8CE5:           .BYTE   0,$74,  0,  0,$12
 byte_8C29:           .BYTE   0,$76,  0,  0,  8
 byte_8CC6:           .BYTE   0,$78,  0,  0,$12
+#endif
 
-
-
+#if 0 /* Silenced since unused */
 static uint8 sim0reset[0x1F] = {
 	0x3B, 0xE9, 0x00, 0xFF, 0xC1, 0x10, 0x31, 0xFE,
 	0x55, 0xC8, 0x10, 0x20, 0x55, 0x47, 0x4F, 0x53,
diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c
index 041d8f5..79e3511 100644
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -100,7 +100,7 @@ static uint64 CartList[] =
 	0
 };
 
-int DetectPRGbonus(CartInfo *tmp) {
+static int DetectPRGbonus(CartInfo *tmp) {
 	int x, i = 0;
 	uint64 partialmd5 = 0;
 
diff --git a/src/boards/n106.c b/src/boards/n106.c
index 0a5116c..f786a57 100644
--- a/src/boards/n106.c
+++ b/src/boards/n106.c
@@ -264,7 +264,7 @@ static void DoNamcoSoundHQ(void) {
 			lengo = LengthCache[P];
 
 			duff2 = FetchDuff(P, envelope);
-			for (V = CVBC << 1; V < SOUNDTS << 1; V++) {
+			for (V = CVBC << 1; V < (int)SOUNDTS << 1; V++) {
 				WaveHi[V >> 1] += duff2;
 				if (!vco) {
 					PlayIndex[P] += freq;
diff --git a/src/boards/vrc2and4.c b/src/boards/vrc2and4.c
index 87c1435..59942bf 100644
--- a/src/boards/vrc2and4.c
+++ b/src/boards/vrc2and4.c
@@ -65,15 +65,15 @@ static void Sync(void) {
 		setchr8(0);
 	else {
 		uint8 i;
-		if (!weirdo)
+		/* if (!weirdo) */
 			for (i = 0; i < 8; i++)
 				setchr1(i << 10, (chrhi[i] | chrreg[i]) >> is22);
-		else {
+		/* else {
 			setchr1(0x0000, 0xFC);
 			setchr1(0x0400, 0xFD);
 			setchr1(0x0800, 0xFF);
 			weirdo--;
-		}
+		} */
 	}
 	switch (mirr & 0x3) {
 	case 0: setmirror(MI_V); break;
diff --git a/src/boards/vrc7.c b/src/boards/vrc7.c
index 5ab7292..fbf21c9 100644
--- a/src/boards/vrc7.c
+++ b/src/boards/vrc7.c
@@ -19,7 +19,10 @@
  */
 
 #include "mapinc.h"
+#include "emu2413.h"
 
+static int32 dwave = 0;
+static OPLL *VRC7Sound = NULL;
 static uint8 vrc7idx, preg[3], creg[8], mirr;
 static uint8 IRQLatch, IRQa, IRQd;
 static int32 IRQCount, CycleCount;
@@ -42,11 +45,6 @@ static SFORMAT StateRegs[] =
 
 /* VRC7 Sound */
 
-#include "emu2413.h"
-
-static int32 dwave = 0;
-static OPLL *VRC7Sound = NULL;
-
 void DoVRC7Sound(void) {
 	int32 z, a;
 	if (FSettings.soundq >= 1)
diff --git a/src/boards/yoko.c b/src/boards/yoko.c
index 175b1b7..9601864 100644
--- a/src/boards/yoko.c
+++ b/src/boards/yoko.c
@@ -71,7 +71,7 @@ static void UNLYOKOSync(void) {
 }
 
 static void M83Sync(void) {
-	switch (mode & 3) {	/* check if it is truth */
+	switch (mode & 3) {	/* check if it is true */
 	case 0: setmirror(MI_V); break;
 	case 1: setmirror(MI_H); break;
 	case 2: setmirror(MI_0); break;