diff --git a/src/common/HighScoresManager.cxx b/src/common/HighScoresManager.cxx
index 3cfbdbdef..f0d4e4658 100644
--- a/src/common/HighScoresManager.cxx
+++ b/src/common/HighScoresManager.cxx
@@ -355,10 +355,10 @@ Int32 HighScoresManager::variation() const
   uInt16 addr = varAddress(properties(props));
 
   if(addr == DEFAULT_ADDRESS)
-    /*if(numVariations() > 1)
+    if(numVariations() == 1)
       return DEFAULT_VARIATION;
-    else*/
-    return NO_VALUE;
+    else
+      return NO_VALUE;
 
   return variation(addr, varBCD(props), varZeroBased(props), numVariations(props));
 }
@@ -458,14 +458,15 @@ Int32 HighScoresManager::convert(uInt32 val, uInt32 maxVal, bool isBCD, bool zer
     ? ceil(log(maxVal) / log(10) * 4)
     : ceil(log(maxVal) / log(2));
 
+  // limit to maxVal's bits
+  val %= 1 << bits;
+
   if (isBCD)
     val = fromBCD(val);
 
   if(val == NO_VALUE)
     return 0;
 
-  // limit to maxVal's bits
-  val %= 1 << bits;
   val += zeroBased ? 1 : 0;
 
   return val;
diff --git a/src/common/stella.pro b/src/common/stella.pro
index cf7bd06d9..2cdb1d58d 100644
--- a/src/common/stella.pro
+++ b/src/common/stella.pro
@@ -25,6 +25,24 @@
 "Cart.Addresses" "DD,DE,DF,80"
 ""
 
+"Cart.MD5" "211774f4c5739042618be8ff67351177"
+"Cart.Manufacturer" "Atari - GCC, Mark Ackerman, Tom Calderwood, Glenn Parker"
+"Cart.ModelNo" "CX2684"
+"Cart.Name" "Galaxian (1983) (Atari)"
+"Display.Phosphor" "YES"
+"Cart.Variations" "9"
+"Cart.Formats" "6,0,B,0,B,0,WAVE"
+"Cart.Addresses" "AC,AD,AE,B3,AF"
+""
+
+"Cart.MD5" "240bfbac5163af4df5ae713985386f92"
+"Cart.Manufacturer" "Activision, Steve Cartwright"
+"Cart.ModelNo" "AX-022"
+"Cart.Name" "Seaquest (1983) (Activision)"
+"Cart.Formats" "6"
+"Cart.Addresses" "B8,B9,BA"
+""
+
 "Cart.MD5" "278f14887d601b5e5b620f1870bc09f6"
 "Cart.Manufacturer" "Thomas Jentzsch"
 "Cart.Name" "SWOOPS! (v0.96) (TJ)"
@@ -35,6 +53,60 @@
 "Cart.Addresses" "FD,FE,FF,FC"
 ""
 
+"Cart.MD5" "2a0ba55e56e7a596146fa729acf0e109"
+"Cart.Manufacturer" "Activision, Bob Whitehead"
+"Cart.ModelNo" "AG-019"
+"Cart.Name" "Sky Jinks (1982) (Activision)"
+"Cart.Variations" "4"
+"Cart.Formats" "4,0,B,1,B,1"
+"Cart.Addresses" "A6,A2,99"
+""
+
+"Cart.MD5" "2bb9f4686f7e08c5fcc69ec1a1c66fe7"
+"Cart.Manufacturer" "Atari - GCC, John Allred, Mike Feinstein"
+"Cart.ModelNo" "CX2688"
+"Cart.Name" "Jungle Hunt (1983) (Atari)"
+"Cart.Variations" "2"
+"Cart.Formats" "6,0,B,0,B,1"
+"Cart.Addresses" "85,84,83,8B"
+""
+
+"Cart.MD5" "318a9d6dda791268df92d72679914ac3"
+"Cart.Manufacturer" "Activision, Steve Cartwright"
+"Cart.ModelNo" "AX-017, AX-017-04"
+"Cart.Name" "MegaMania (1982) (Activision)"
+"Cart.Variations" "4"
+"Cart.Formats" "6,0,B,0,B,1"
+"Cart.Addresses" "DB,DC,DD,80"
+""
+
+"Cart.MD5" "36b20c427975760cb9cf4a47e41369e4"
+"Cart.Manufacturer" "Coleco - Woodside Design Associates - Imaginative Systems Software, Garry Kitchen"
+"Cart.ModelNo" "2451"
+"Cart.Name" "Donkey Kong (1982) (Coleco)"
+"Cart.Formats" "6,2"
+"Cart.Addresses" "87,88"
+""
+
+"Cart.MD5" "3a2e2d0c6892aa14544083dfb7762782"
+"Cart.Manufacturer" "Atari, Rob Fulop - Sears"
+"Cart.ModelNo" "CX2638 - 49-75166"
+"Cart.Name" "Missile Command (1981) (Atari)"
+"Display.Phosphor" "YES"
+"Cart.Variations" "34"
+"Cart.Formats" "6"
+"Cart.Addresses" "F3,F1,EF,E9"
+""
+
+"Cart.MD5" "3e90cf23106f2e08b2781e41299de556"
+"Cart.Manufacturer" "Activision, David Crane"
+"Cart.ModelNo" "AX-018, AX-018-04"
+"Cart.Name" "Pitfall! (1982) (Activision)"
+"Cart.Note" "Pitfall Harry's Jungle Adventure (Jungle Runner)"
+"Cart.Formats" "6"
+"Cart.Addresses" "D5,D6,D7"
+""
+
 "Cart.MD5" "541cac55ebcf7891d9d51c415922303f"
 "Cart.Name" "SF2_20131217_RC8_NTSC"
 "Display.Phosphor" "YES"
@@ -67,6 +139,14 @@
 "Cart.Addresses" "B3,B5,80,0"
 ""
 
+"Cart.MD5" "7e52a95074a66640fcfde124fffd491a"
+"Cart.Manufacturer" "Atari - GCC, Mike Feinstein, John Mracek"
+"Cart.ModelNo" "CX2673"
+"Cart.Name" "Phoenix (1983) (Atari)"
+"Cart.Formats" "6"
+"Cart.Addresses" "C9,C8,C7"
+""
+
 "Cart.MD5" "91c2098e88a6b13f977af8c003e0bca5"
 "Cart.Manufacturer" "Atari - GCC"
 "Cart.ModelNo" "CX2676"
@@ -113,6 +193,14 @@
 "Cart.Addresses" "95,96,80"
 ""
 
+"Cart.MD5" "be929419902e21bd7830a7a7d746195d"
+"Cart.Manufacturer" "Activision, Garry Kitchen"
+"Cart.ModelNo" "AX-025, AX-025-04"
+"Cart.Name" "Keystone Kapers (1983) (Activision)"
+"Cart.Formats" "6"
+"Cart.Addresses" "9A,9B,9C"
+""
+
 "Cart.MD5" "c1cb228470a87beb5f36e90ac745da26"
 "Cart.Manufacturer" "Activision, Bob Whitehead"
 "Cart.ModelNo" "AX-015, AX-015-04"
@@ -122,6 +210,16 @@
 "Cart.Addresses" "EC,EE,F0,E0"
 ""
 
+"Cart.MD5" "c5930d0e8cdae3e037349bfa08e871be"
+"Cart.Manufacturer" "Atari, Howard Scott Warshaw - Sears"
+"Cart.ModelNo" "CX2655 - 49-75167"
+"Cart.Name" "Yars' Revenge (1982) (Atari)"
+"Display.Phosphor" "YES"
+"Cart.Variations" "8"
+"Cart.Formats" "6,0,B,0,B,1"
+"Cart.Addresses" "E0,E1,E2,80"
+""
+
 "Cart.MD5" "ccbd36746ed4525821a8083b0d6d2c2c"
 "Cart.Manufacturer" "Atari, Brad Stewart - Sears"
 "Cart.ModelNo" "CX2649, 49-75163"
diff --git a/src/gui/HighScoresDialog.cxx b/src/gui/HighScoresDialog.cxx
index 1cea49e8c..47c3e9350 100644
--- a/src/gui/HighScoresDialog.cxx
+++ b/src/gui/HighScoresDialog.cxx
@@ -177,7 +177,11 @@ void HighScoresDialog::loadConfig()
   }
   myVariationPopup->addItems(items);
 
-  Int32 variation = instance().highScores().variation();
+  Int32 variation;
+  if(instance().highScores().numVariations() == 1)
+    variation = HSM::DEFAULT_VARIATION;
+  else
+    variation = instance().highScores().variation();
   if(variation != HSM::NO_VALUE)
   {
     myVariationPopup->setSelected(variation);