diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp
index 5eba45376..07bf06f4c 100644
--- a/desmume/src/GPU.cpp
+++ b/desmume/src/GPU.cpp
@@ -1100,7 +1100,11 @@ INLINE void renderline_textBG(GPU * gpu, u8 num, u8 * dst, u32 Y, u16 XBG, u16 Y
 	TILEENTRY tileentry;
 
 
-	map = (u8 *)MMU_RenderMapToLCD(gpu->BG_map_ram[num] + (tmp&31) * 64);
+	//zero 30-dec-2008 - if you mask by 31 here, you lose the ability to correctly map the bottom half of 512-tall BG.
+	//the masking to keep it to a reasonable value was already done when tmp was calculated
+	//map = (u8 *)MMU_RenderMapToLCD(gpu->BG_map_ram[num] + (tmp&31) * 64);
+	map = (u8 *)MMU_RenderMapToLCD(gpu->BG_map_ram[num] + (tmp) * 64);
+	
 	if (!map) return;
 	
 	if(tmp>31) 
@@ -1251,6 +1255,7 @@ INLINE void renderline_textBG(GPU * gpu, u8 num, u8 * dst, u32 Y, u16 XBG, u16 Y
 	}
 
 	yoff = ((YBG&7)<<3);
+
 	xfin = 8 - (xoff&7);
 	for(x = 0; x < LG; xfin = std::min<u16>(x+8, LG))
 	{
diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp
index a45803f63..95fe262f1 100644
--- a/desmume/src/MMU.cpp
+++ b/desmume/src/MMU.cpp
@@ -39,9 +39,14 @@
 #include "gfx3d.h"
 #include "rtc.h"
 #include "GPU_osd.h"
-#include "zero_private.h"
 #include "mc.h"
 
+#ifdef DO_ASSERT_UNALIGNED
+#define ASSERT_UNALIGNED(x) assert(x)
+#else
+#define ASSERT_UNALIGNED(x)
+#endif
+
 static void FASTCALL _MMU_ARM9_write08(u32 adr, u8 val);
 static void FASTCALL _MMU_ARM9_write16(u32 adr, u16 val);
 static void FASTCALL _MMU_ARM9_write32(u32 adr, u32 val);
@@ -777,7 +782,7 @@ static void execdiv() {
 	u16 cnt = T1ReadWord(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x280);
 	s64 num,den;
 	s64 res,mod;
-
+
 	switch(cnt&3)
 	{
 	case 0:
diff --git a/desmume/src/windows/AboutBox.cpp b/desmume/src/windows/AboutBox.cpp
index bced7f8bc..6daf1007d 100644
--- a/desmume/src/windows/AboutBox.cpp
+++ b/desmume/src/windows/AboutBox.cpp
@@ -42,7 +42,7 @@ const char	*team[TEAM] = { "Original author",
 							"Andres Delikat",
 							"Riccardo Magliocchetti",
 							"Max Tabachenko (CrazyMax/mtabachenko)",
-							"Zeromus",
+							"zeromus",
 							"Luigi__",
 							"",
 							"Contributors",
diff --git a/desmume/src/zero_private.h b/desmume/src/zero_private.h
deleted file mode 100644
index 16279c0ae..000000000
--- a/desmume/src/zero_private.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _zero_private_h
-#define _zero_private_h
-
-//#define ZERO_MODE
-
-#ifdef ZERO_MODE
-#define ASSERT_UNALIGNED(x) assert(x)
-#else
-#define ASSERT_UNALIGNED(x)
-#endif
-
-#endif