diff --git a/src/emucore/Cart.cxx b/src/emucore/Cart.cxx
index 159f61115..b97b73113 100644
--- a/src/emucore/Cart.cxx
+++ b/src/emucore/Cart.cxx
@@ -72,13 +72,13 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size,
     // from the opposite bank compared to normal ones
     type = "F8 swapped";
   }
-  else if(md5 == "291bcdb05f2b37cdf9452d2bf08e0321")
+  else if(md5 == "291bcdb05f2b37cdf9452d2bf08e0321" ||
+          md5 == "291dd47588b9158beebe4accc3a093a6")
   {
-    // The 32-in-1 ROM consists of 32 games of 2K each
-    // The current game is automatically automatically incremented on each
-    // power cycle; we emulate this by using saving the current game id
-    // on each run, and creating a 2K Cart of the appropriate part of
-    // the image
+    // The 32-in-1 ROM consists of 32 games of 2K each, where the current
+    // game is automatically incremented on each power cycle
+    // We emulate this by incrementing the current game id on each run,
+    // and creating a 2K Cart of the appropriate part of the image
     if(size == 32*2048)
     {
       type = "32in1";
@@ -120,7 +120,7 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size,
     const uInt8* piece = image + i*2048;
     // Move to the next game the next time this ROM is loaded
     settings.setInt("romloadcount", (i+1)%32);
-    cartridge = new Cartridge2K(piece, 2048);
+    cartridge = new Cartridge2K(piece, size);
   }
   else if(type == "3E")
     cartridge = new Cartridge3E(image, size);
diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx
index ba0481bbf..e1002eceb 100644
--- a/src/emucore/DefProps.hxx
+++ b/src/emucore/DefProps.hxx
@@ -545,9 +545,9 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = {
   { "28a4cd87fb9de4ee91693a38611cb53c", "", "", "Skeleton (V1.1) (NTSC) (24-10-2002) (Eric Ball)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "28d5df3ed036ed63d33a31d0d8b85c47", "Bit Corporation", "PG204", "Open, Sesame! (1982) (BitCorp) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "256", "YES", "" }, 
   { "2903896d88a341511586d69fcfc20f7d", "Activision, David Crane", "AX-014, AX-014-04", "Grand Prix (1982) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "291bcdb05f2b37cdf9452d2bf08e0321", "Atari", "CX26163P", "32 in 1 Game Cartridge (1988) (Atari) (Prototype) (PAL)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
+  { "291bcdb05f2b37cdf9452d2bf08e0321", "Atari", "CX26163P", "32 in 1 Game Cartridge (1988) (Atari) (Prototype) (PAL)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "42", "", "", "" }, 
   { "291cc37604bc899e8e065c30153fc4b9", "Activision, Carol Shaw", "AX-020, AX-020-04", "River Raid (1982) (Activision) (16K)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "291dd47588b9158beebe4accc3a093a6", "Atari", "", "32 in 1 Console ROM (02-10-1989) (Atari) (Prototype) (PAL)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
+  { "291dd47588b9158beebe4accc3a093a6", "Atari", "", "32 in 1 Console ROM (02-10-1989) (Atari) (Prototype) (PAL)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "42", "", "", "" }, 
   { "292a0bb975b2587f9ac784c960e1b453", "", "", "Qb (05-02-2001) (AD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "292f2446a0325b7b423e88a2ebfeb5a0", "", "", "Cube Conquest (Non Interlaced) (Billy Eno) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "29396db58406084e416032c372734a3e", "", "", "Gunfight 2600 - Fixed Beta Release! (2001) (MP)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
@@ -1452,7 +1452,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = {
   { "70d14c66c319683b4c19abbe0e3db57c", "", "", "Oystron (V2.82) (Piero Cavina) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "712924a2c7b692f6e7b009285c2169a7", "Arcadia Corporation, Steve Hales, Stephen Harland Landrum", "AR-4102", "Meteoroids (1982) (Arcadia) (Prototype)", "Suicide Mission Beta", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "713095cd968b1aff45a2562ea4bbcbfe", "", "", "Image - Qb (16-02-2003) (TJ)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "713fde2af865b6ec464dfd72e2ebb83e", "", "", "Challenge (208 in 1) (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "250", "YES", "" }, 
+  { "713fde2af865b6ec464dfd72e2ebb83e", "", "", "Challenge (208 in 1) (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "71464c54da46adae9447926fdbfc1abe", "M Network, Bruce Pedersen - INTV", "MT5663", "Lock 'n' Chase (1982) (M Network)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "7146dd477e019f81eac654a79be96cb5", "Atari, Dan Hitchens", "CX2685", "Gravitar (1983) (Atari)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "714e13c08508ee9a7785ceac908ae831", "Home Vision - Gem Int'l Corp.", "VCS83123", "Parachute (1983) (Home Vision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
@@ -2538,7 +2538,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = {
   { "cc724ebe74a109e39c0b2784ddc980ca", "Atari, Jerome Domurat, Dave Staugas", "CX2682", "Krull (05-27-1983) (Atari) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "cc74ddb45d7bc4d04c2e6f1907416699", "", "", "Colour Display Programme (1997) (Chris Cracknell)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "cca33ae30a58f39e3fc5d80f94dc0362", "", "", "Okie Dokie (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "ccb56107ff0492232065b85493daa635", "Bit Corporation", "PG206 [demonstration cartridge]", "Bobby Is Going Home (1983) (BitCorp) (PAL) [demo cart]", "AKA Bobby geht Heim", "", "", "", "", "", "", "", "", "", "", "", "40", "250", "", "" }, 
+  { "ccb56107ff0492232065b85493daa635", "Bit Corporation", "PG206 [demonstration cartridge]", "Bobby Is Going Home (1983) (BitCorp) (PAL) [demo cart]", "AKA Bobby geht Heim", "", "", "", "", "", "", "", "", "", "", "", "40", "", "", "" }, 
   { "ccb5fa954fb76f09caae9a8c66462190", "Answer Software Corporation", "ASC1001", "Malagai (1983) (Answer Software)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "ccb807eb79b0ed0f5fdc460445ef703a", "", "", "Superman (Stunt_Cycle_Rules!) (Hack)", "Hack of Superman", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "ccbd36746ed4525821a8083b0d6d2c2c", "Atari, Brad Stewart - Sears", "CX2649, 49-75163", "Asteroids (1981) (Atari) [no copyright]", "", "Common", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
@@ -2579,7 +2579,7 @@ static const char* DefProps[DEF_PROPS_SIZE][20] = {
   { "cf507910d6e74568a68ac949537bccf9", "Sega", "003-01", "Thunderground (1983) (Sega)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "cf63ffac9da89ef09c6c973083061a47", "CCE", "C-859", "MASH (1983) (CCE)", "AKA M.A.S.H", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "cf9069f92a43f719974ee712c50cd932", "Video Gems", "VG-04", "Mission Survive (1983) (Video Gems) (PAL)", "", "", "", "", "", "A", "", "", "", "", "", "", "", "", "YES", "" }, 
-  { "cfad2b9ca8b8fec7fb1611d656cc765b", "Bit Corporation", "PG207", "Mission 3,000 A.D. (1983) (BitCorp) (PAL) [demo cart]", "demonstration cartridge", "", "", "", "", "", "", "", "", "", "", "", "", "250", "YES", "" }, 
+  { "cfad2b9ca8b8fec7fb1611d656cc765b", "Bit Corporation", "PG207", "Mission 3,000 A.D. (1983) (BitCorp) (PAL) [demo cart]", "demonstration cartridge", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "cfb3260c603b0341d49ddfc94051ec10", "Dactari - Milmar", "", "Boxing (Dactari - Milmar)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "cfc226d04d7490b69e155abd7741e98c", "Atari, Matthew L. Hubbard", "CX26159", "Double Dunk (1989) (Atari) (PAL)", "AKA Super Basketball", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "cfd6a8b23d12b0462baf6a05ef347cd8", "Activision, Larry Kaplan", "AX-006", "Bridge (1980) (Activision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro
index 7f4b1e50d..ea38f3841 100644
--- a/src/emucore/stella.pro
+++ b/src/emucore/stella.pro
@@ -1945,6 +1945,7 @@
 "Cartridge.ModelNo" "CX26163P"
 "Cartridge.Name" "32 in 1 Game Cartridge (1988) (Atari) (Prototype) (PAL)"
 "Cartridge.Rarity" "Prototype"
+"Display.YStart" "42"
 ""
 
 "Cartridge.MD5" "1d1d2603ec139867c1d1f5ddf83093f1"
@@ -3185,6 +3186,7 @@
 "Cartridge.Manufacturer" "Atari"
 "Cartridge.Name" "32 in 1 Console ROM (02-10-1989) (Atari) (Prototype) (PAL)"
 "Cartridge.Rarity" "Prototype"
+"Display.YStart" "42"
 ""
 
 "Cartridge.MD5" "29396db58406084e416032c372734a3e"
@@ -8631,7 +8633,6 @@
 
 "Cartridge.MD5" "713fde2af865b6ec464dfd72e2ebb83e"
 "Cartridge.Name" "Challenge (208 in 1) (Unknown) (PAL)"
-"Display.Height" "250"
 "Display.Phosphor" "YES"
 ""
 
@@ -15196,7 +15197,6 @@
 "Cartridge.Name" "Bobby Is Going Home (1983) (BitCorp) (PAL) [demo cart]"
 "Cartridge.Note" "AKA Bobby geht Heim"
 "Display.YStart" "40"
-"Display.Height" "250"
 ""
 
 "Cartridge.MD5" "ccb807eb79b0ed0f5fdc460445ef703a"
@@ -15440,7 +15440,6 @@
 "Cartridge.ModelNo" "PG207"
 "Cartridge.Name" "Mission 3,000 A.D. (1983) (BitCorp) (PAL) [demo cart]"
 "Cartridge.Note" "demonstration cartridge"
-"Display.Height" "250"
 "Display.Phosphor" "YES"
 ""