diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index 02d1810da81..5e2ba43f017 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -57,6 +57,9 @@
                (medium) default. Phase shifting falls outside the realm of
                video controls and hope to implement a selectable toggle
                hardware option similar to Donkey Kong TKG02/TKG04.
+
+    2013/09/19 Robert Tuccitto  Cleanup of Address Maps, high score maps
+               added.
 ***************************************************************************/
 
 #include "emu.h"
@@ -82,20 +85,22 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
 	AM_RANGE(0x0040, 0x00ff) AM_READ_BANK("bank5") AM_WRITE(a7800_RAM0_w)   /* RAM (6116 block 0) */
 	AM_RANGE(0x0140, 0x01ff) AM_RAMBANK("bank6")    /* RAM (6116 block 1) */
 	AM_RANGE(0x0280, 0x02ff) AM_DEVREADWRITE("riot", riot6532_device, read, write)
-	AM_RANGE(0x0450, 0x045f) /*XBOARD POKEY1*/
-	AM_RANGE(0x0460, 0x046f) /*XBOARD POKEY2*/
-	AM_RANGE(0x0470, 0x047f) /*XBOARD CTRL*/
+	AM_RANGE(0x0450, 0x045f) /* XBOARD POKEY1 */
+	AM_RANGE(0x0460, 0x046f) /* XBOARD POKEY2 */
+	AM_RANGE(0x0470, 0x047f) /* XBOARD CTRL */
 	AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_RAM    /* RIOT RAM */
+       AM_RANGE(0x1000, 0x17ff) AM_RAM /* hs SRAM */
 	AM_RANGE(0x1800, 0x27ff) AM_RAM
 	AM_RANGE(0x2800, 0x2fff) AM_RAMBANK("bank7")    /* MAINRAM */
 	AM_RANGE(0x3000, 0x37ff) AM_RAMBANK("bank7")    /* MAINRAM */
 	AM_RANGE(0x3800, 0x3fff) AM_RAMBANK("bank7")    /* MAINRAM */
+       AM_RANGE(0x3000, 0x3fff) AM_ROM  /* hs ROM space */
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")                        /* f18 hornet */
-	AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")                        /* sc */
+	AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */
+       AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")                        /* sc */
 	AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank3")                        /* sc + ac */
 	AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank4")                        /* ac */
-	AM_RANGE(0xe000, 0xffff) AM_ROM
-	AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */
+	AM_RANGE(0xe000, 0xffff) AM_ROM	
 ADDRESS_MAP_END
 
 
diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c
index 0cd4a962a43..7612bd1b21a 100644
--- a/src/mess/drivers/nes.c
+++ b/src/mess/drivers/nes.c
@@ -827,6 +827,10 @@ ROM_START( dendy )
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )  /* Main RAM */
 ROM_END
 
+ROM_START( gchinatv )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )  /* Main RAM */
+	ROM_REGION( 0x800,   "ciram", ROMREGION_ERASE00 )  /* CI RAM */
+ROM_END
 
 /***************************************************************************
 
@@ -842,3 +846,4 @@ CONS( 1986, famitwin,  nes,    0,     famicom,  famicom, nes_state, famicom, "Sh
 CONS( 198?, m82,       nes,    0,     nes,      nes, driver_device,     0,       "Nintendo",  "M82 Display Unit", GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
 CONS( 1996, drpcjr,    nes,    0,     famicom,  famicom, nes_state, famicom, "Bung",      "Doctor PC Jr", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
 CONS( 1992, dendy,     nes,    0,     dendy,    nes, driver_device,     0,       "Steepler",  "Dendy Classic", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
+CONS( 198?, gchinatv,  nes,    0,     nespal,   nes, driver_device,     0,       "Golden China",  "Golden China TV Game", GAME_IMPERFECT_GRAPHICS | GAME_SUPPORTS_SAVE )
diff --git a/src/mess/mess.lst b/src/mess/mess.lst
index 3ad029a1b26..a4fdab2f8b6 100644
--- a/src/mess/mess.lst
+++ b/src/mess/mess.lst
@@ -73,6 +73,7 @@ snespal   // Nintendo Super Nintendo PAL
 n64       // Nintendo N64
 n64dd     // Nintendo N64 (64DD Attachment)
 pokemini  // Nintendo Pokemon Mini
+gchinatv // Golden China TV Game Centre
 
 megaduck  // Megaduck