diff --git a/hash/genius.xml b/hash/genius.xml
index 9808f92509a..184d0c635fe 100644
--- a/hash/genius.xml
+++ b/hash/genius.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <softwarelist name="genius" description="VTech Genius cartridges">
 
-<!-- this software list contains all available VTech Genius family cartridges, needs to be split to respective systems later -->
+<!-- this software list contains miscellaneous VTech Genius family cartridges, needs to be split to respective systems later -->
 
 
 <!-- Compatible with: Genius Leader series (actual compatible models as listed on the box are documented below) -->
@@ -49,18 +49,4 @@
 		</part>
 	</software>
 
-<!-- According to the boxart, this is compatible with: Junior Redstar/Redstar 2 -->
-	<software name="wortspie">
-		<description>Wortspiele</description>
-		<year>200?</year>
-		<publisher>Video Technology</publisher>
-		<info name="serial" value="80-10171" />
-
-		<part name="rom" interface="genius_rom">
-			<dataarea name="rom" size="0x40000">
-				<rom name="27-5883-00" size="0x40000" crc="99214bce" sha1="75294fbc411b0b39b3db4727824faf29127675af"/>
-			</dataarea>
-		</part>
-	</software>
-
 </softwarelist>
diff --git a/hash/gj4000.xml b/hash/gj4000.xml
new file mode 100644
index 00000000000..ba93366de5a
--- /dev/null
+++ b/hash/gj4000.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="gj4000" description="VTech Genius Junior 4000 cartridges">
+
+<!-- According to the boxart, this is compatible with: Junior 4000/5000 -->
+	<software name="wfk" supported="no">
+		<description>Wissen für Kinder</description>
+		<year>199?</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-15272" />
+
+		<part name="rom" interface="genius_rom">
+			<dataarea name="rom" size="0x20000">
+				<rom name="27-6035-00.u2" size="0x20000" crc="8dcaa8c0" sha1="bca46f6cd150632fca79b1c2b524cd8ed1dacf84"/>
+			</dataarea>
+		</part>
+	</software>
+</softwarelist>
diff --git a/hash/gjrstar.xml b/hash/gjrstar.xml
new file mode 100644
index 00000000000..03fe6974b2e
--- /dev/null
+++ b/hash/gjrstar.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<softwarelist name="gjrstar" description="VTech Genius Junior Redstar cartridges">
+
+<!-- According to the boxart, this is compatible with: Junior Redstar/Redstar 2 -->
+	<software name="wortspie">
+		<description>Wortspiele</description>
+		<year>200?</year>
+		<publisher>Video Technology</publisher>
+		<info name="serial" value="80-10171" />
+
+		<part name="rom" interface="genius_rom">
+			<dataarea name="rom" size="0x40000">
+				<rom name="27-5883-00" size="0x40000" crc="99214bce" sha1="75294fbc411b0b39b3db4727824faf29127675af"/>
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff --git a/hash/gl2000.xml b/hash/gl2000.xml
index 1a1577af8c3..bc807fd9ab2 100644
--- a/hash/gl2000.xml
+++ b/hash/gl2000.xml
@@ -73,10 +73,13 @@
 		</part>
 	</software>
 
+<!-- According to the boxart, this is compatible with: Leader 1000/2000/2000 Plus
+     A (later) sticker says compatibility extends to Leader 3000S/4000 Quadro/4004 Quadro L/6000 SL -->
 	<software name="bol">
 		<description>Berühmte Orte und Leute</description>
-		<year>199?</year>
+		<year>1993</year>
 		<publisher>Video Technology</publisher>
+		<info name="serial" value="80-1589" />
 		<part name="rom" interface="genius_cart">
 			<dataarea name="rom" size="0x20000">
 				<rom name="80-1587" size="0x20000" crc="55eef702" sha1="52923c2b337a49a006affbd30f953c406dc745c6"/>
diff --git a/hash/gl6000sl.xml b/hash/gl6000sl.xml
index 00dfdc5ad85..6ad7724745c 100644
--- a/hash/gl6000sl.xml
+++ b/hash/gl6000sl.xml
@@ -14,4 +14,17 @@
 			</dataarea>
 		</part>
 	</software>
+
+<!-- According to the boxart, this is compatible with: Leader 6000 SL -->
+	<software name="update" supported="no">
+		<description>Update - Rechtschreibreform</description>
+		<year>199?</year>
+		<publisher>Video Technology</publisher>
+		<info name="serial" value="" />
+		<part name="rom" interface="genius_cart">
+			<dataarea name="rom" size="0x80000">
+				<rom name="27-05985-000-000.u1" size="0x80000" crc="139906cd" sha1="69072eaa70d9cf80f08a3f67b5755967a96deb01"/>
+			</dataarea>
+		</part>
+	</software>
 </softwarelist>
diff --git a/src/mame/drivers/geniusjr.cpp b/src/mame/drivers/geniusjr.cpp
index 578405981d2..4e2ca49ef0f 100644
--- a/src/mame/drivers/geniusjr.cpp
+++ b/src/mame/drivers/geniusjr.cpp
@@ -172,6 +172,7 @@ public:
 	{
 	}
 
+	void gln(machine_config &config);
 	void gj4000(machine_config &config);
 	void gj5000(machine_config &config);
 	void gjrstar(machine_config &config);
@@ -219,7 +220,7 @@ void geniusjr_state::machine_start()
 	m_rombank->set_entry(0);
 }
 
-void geniusjr_state::gj4000(machine_config &config)
+void geniusjr_state::gln(machine_config &config)
 {
 	M68HC05L9(config, m_maincpu, 8'000'000); // unknown clock
 	m_maincpu->set_addrmap(AS_PROGRAM, &geniusjr_state::gj4000_map);
@@ -227,12 +228,21 @@ void geniusjr_state::gj4000(machine_config &config)
 	m_bank_size = 0x8000;
 }
 
+void geniusjr_state::gj4000(machine_config &config)
+{
+	gln(config);
+
+	SOFTWARE_LIST(config, "cart_list").set_original("gj4000");
+}
+
 void geniusjr_state::gj5000(machine_config &config)
 {
 	M68HC05L9(config, m_maincpu, 8'000'000); // unknown clock (type also uncertain)
 	m_maincpu->set_addrmap(AS_PROGRAM, &geniusjr_state::gj5000_map);
 
 	m_bank_size = 0x4000;
+
+	SOFTWARE_LIST(config, "cart_list").set_original("gj4000");
 }
 
 void geniusjr_state::gjrstar(machine_config &config)
@@ -241,19 +251,21 @@ void geniusjr_state::gjrstar(machine_config &config)
 	m_maincpu->set_addrmap(AS_PROGRAM, &geniusjr_state::gjrstar_map);
 
 	m_bank_size = 0x2000;
+
+	SOFTWARE_LIST(config, "cart_list").set_original("gjrstar");
 }
 
 void geniusjr_state::gjmovie(machine_config &config)
 {
 	gjrstar(config);
 
-	SOFTWARE_LIST(config, "cart_list").set_original("gjmovie");
+	subdevice<software_list_device>("cart_list")->set_original("gjmovie");
 }
 
 
 ROM_START( gj4000 )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x40000, "extrom", 0 )
 	ROM_LOAD( "27-05886-000-000.u4", 0x000000, 0x40000, CRC(5f6db95b) SHA1(fe683154e33a82ea38696096616d11e850e0c7a3))
@@ -261,7 +273,7 @@ ROM_END
 
 ROM_START( gj5000 )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x80000, "extrom", 0 )
 	ROM_LOAD( "27-6019-01.u2", 0x000000, 0x80000, CRC(946e5b7d) SHA1(80963d6ad80d49e54c8996bfc77ac135c4935be5))
@@ -269,7 +281,7 @@ ROM_END
 
 ROM_START( gjmovie )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x40000, "extrom", 0 )
 	ROM_LOAD( "lh532hlk.bin", 0x000000, 0x40000, CRC(2e64c296) SHA1(604034f902e20851cb9af60964031a508ceef83e))
@@ -277,7 +289,7 @@ ROM_END
 
 ROM_START( gjrstar )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x40000, "extrom", 0 )
 	ROM_LOAD( "27-5740-00.u1", 0x000000, 0x40000, CRC(ff3dc3bb) SHA1(bc16dfc1e12b0008456c700c431c8df6263b671f))
@@ -285,7 +297,7 @@ ROM_END
 
 ROM_START( gjrstar2 )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x40000, "extrom", 0 )
 	ROM_LOAD( "27-5740-00.u1", 0x000000, 0x40000, CRC(ff3dc3bb) SHA1(bc16dfc1e12b0008456c700c431c8df6263b671f))     // identical to 'Genius Junior Redstar'
@@ -293,7 +305,7 @@ ROM_END
 
 ROM_START( gjrstar3 )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x40000, "extrom", 0 )
 	ROM_LOAD( "54-06056-000-000.u3", 0x000000, 0x040000, CRC(72522179) SHA1(ede9491713ad018012cf925a519bcafe126f1ad3))
@@ -301,7 +313,7 @@ ROM_END
 
 ROM_START( gln )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x80000, "extrom", 0 )
 	ROM_LOAD( "27-5308-00_9524_d.bin", 0x000000, 0x080000, CRC(d1b994ee) SHA1(b5cf0810df0676712e4f30e279cc46c19b4277dd))
@@ -309,7 +321,7 @@ ROM_END
 
 ROM_START( pitagjr )
 	ROM_REGION( 0x2000, "maincpu", 0 )
-	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x1fff, NO_DUMP )
+	ROM_LOAD( "hc05_internal.bin", 0x0000, 0x2000, NO_DUMP )
 
 	ROM_REGION( 0x40000, "extrom", 0 )
 	ROM_LOAD( "lh532hjt_9811d.u3", 0x00000, 0x40000, CRC(23878b45) SHA1(8f3c41c10cfde9d76763c3a8701ec6616db4ab40) )
@@ -323,5 +335,5 @@ COMP( 1996, gjrstar,  0,       0,      gjrstar,  geniusjr, geniusjr_state, empty
 COMP( 1996, gjrstar2, gjrstar, 0,      gjrstar,  geniusjr, geniusjr_state, empty_init, "VTech",  "Genius Junior Redstar 2 (Germany)", MACHINE_IS_SKELETON )
 COMP( 1998, gjrstar3, 0,       0,      gjrstar,  geniusjr, geniusjr_state, empty_init, "VTech",  "Genius Junior Redstar 3 (Germany)", MACHINE_IS_SKELETON )
 COMP( 1998, gj5000,   0,       0,      gj5000,   geniusjr, geniusjr_state, empty_init, "VTech",  "Genius Junior 5000 (Germany)",      MACHINE_IS_SKELETON )
-COMP( 1993, gln,      0,       0,      gj4000,   geniusjr, geniusjr_state, empty_init, "VTech",  "Genius Leader Notebook",            MACHINE_IS_SKELETON )
+COMP( 1993, gln,      0,       0,      gln,      geniusjr, geniusjr_state, empty_init, "VTech",  "Genius Leader Notebook",            MACHINE_IS_SKELETON )
 COMP( 199?, pitagjr,  0,       0,      gjrstar,  geniusjr, geniusjr_state, empty_init, "VTech",  "Pitagorin Junior",                  MACHINE_IS_SKELETON )