diff --git a/Package/Environment/Common/collections/Arcade/system_artwork/logo.png b/Package/Environment/Common/collections/Arcade/system_artwork/logo.png
index 26f9fd9..cbfd7a1 100644
Binary files a/Package/Environment/Common/collections/Arcade/system_artwork/logo.png and b/Package/Environment/Common/collections/Arcade/system_artwork/logo.png differ
diff --git a/Package/Environment/Common/layouts/Aeon Nox/layout 16x9.xml b/Package/Environment/Common/layouts/Aeon Nox/layout 16x9.xml
index 1eed0da..0053deb 100644
--- a/Package/Environment/Common/layouts/Aeon Nox/layout 16x9.xml	
+++ b/Package/Environment/Common/layouts/Aeon Nox/layout 16x9.xml	
@@ -973,7 +973,7 @@
 
 
     <!-- Logo Menu -->
-    <menu type="custom" imageType="logo" scrollTime=".35" scrollAcceleration=".04" orientation="horizontal" x="0" width="center" y="910" algorithm="easeincircular">
+    <menu type="custom" imageType="logo" scrollTime=".3" scrollAcceleration=".04" orientation="horizontal" x="0" width="center" y="910" algorithm="easeincircular">
         <itemDefaults alpha="0.2" x="center" y="center" maxWidth="400" height="90" xOrigin="center" yOrigin="center" yOffset="-5" fontSize="144" loadFontSize="144" layer="12"/>
         <item xOffset="-1440" alpha="0"/>
         <item xOffset="-1440">
@@ -1367,7 +1367,7 @@
 
 
     <!-- Selected Title -->
-    <reloadableText type="title" alpha="0" x="center" y="92" maxWidth="500" xOrigin="center" yOrigin="center" fontColor="75c8f7" fontSize="40" loadFontSize="40" layer="10">
+    <reloadableText type="title" alpha="0" x="center" y="92" maxWidth="1500" xOrigin="center" yOrigin="center" fontColor="75c8f7" fontSize="40" loadFontSize="40" layer="10">
         <onExit>
             <set duration=".25">
                 <animate type="alpha" to="0" algorithm="easeinquadratic"/>
@@ -1756,7 +1756,7 @@
 
 
     <!-- Box Menu -->
-    <menu type="custom" imageType="artwork_front" scrollTime=".35" scrollAcceleration=".04" orientation="horizontal" textFallback="true" x="0" font="fonts/Oswald-Regular.ttf" fontSize="20" loadFontSize="20" width="center" y="980" algorithm="easeincircular">
+    <menu type="custom" imageType="artwork_front" scrollTime=".3" scrollAcceleration=".04" orientation="horizontal" textFallback="true" x="0" font="fonts/Oswald-Regular.ttf" fontSize="20" loadFontSize="20" width="center" y="980" algorithm="easeincircular">
         <itemDefaults alpha="1" x="center" y="980" width="270" maxHeight="340" xOrigin="center" yOrigin="bottom" layer="12" fontSize="50" loadFontSize="50" fontColor="ffffff" reflection="bottom" reflectionDistance="2" reflectionScale="1" reflectionAlpha=".2"/>
         <item xOffset="-1150" alpha="0"/>
         <onExit>
@@ -1943,12 +1943,12 @@
                 <animate type="maxHeight" to="445"/>
             </set>
             <set duration=".24">
-                <animate type="alpha" from="0" to=".9" algorithm="easeinquadratic"/>
+                <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
             </set>
         </onMenuEnter>
         <onMenuExit menuIndex="1">
             <set duration=".24">
-                <animate type="alpha" from=".9" to="0" algorithm="easeinquadratic"/>
+                <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
             </set>
             <set duration=".01">
                 <animate type="x"         to="1555"/>
@@ -1959,7 +1959,7 @@
         </onMenuExit>
         <onHighlightEnter menuIndex="1">
             <set duration=".25">
-                <animate type="alpha" to=".9" algorithm="easeinquadratic"/>
+                <animate type="alpha" to="1" algorithm="easeinquadratic"/>
             </set>
         </onHighlightEnter>
         <onHighlightExit menuIndex="1">
@@ -1975,7 +1975,7 @@
     <!----------------------------------------------------------------------------------------------------------------------------------->
 
 
-    <reloadableImage type="playlist" mode="common" alpha="0" x="1100" y="430" xOrigin="center" yOrigin="top" maxHeight="40" layer="19">
+    <reloadableImage type="playlist" mode="common" alpha="0" x="1150" y="430" xOrigin="center" yOrigin="top" maxHeight="40" layer="19">
         <onEnter>
             <set duration=".8">
                 <animate type="nop"/>
diff --git a/Package/Environment/Common/layouts/Aeon Nox/layout.xml b/Package/Environment/Common/layouts/Aeon Nox/layout.xml
index 1eed0da..0053deb 100644
--- a/Package/Environment/Common/layouts/Aeon Nox/layout.xml	
+++ b/Package/Environment/Common/layouts/Aeon Nox/layout.xml	
@@ -973,7 +973,7 @@
 
 
     <!-- Logo Menu -->
-    <menu type="custom" imageType="logo" scrollTime=".35" scrollAcceleration=".04" orientation="horizontal" x="0" width="center" y="910" algorithm="easeincircular">
+    <menu type="custom" imageType="logo" scrollTime=".3" scrollAcceleration=".04" orientation="horizontal" x="0" width="center" y="910" algorithm="easeincircular">
         <itemDefaults alpha="0.2" x="center" y="center" maxWidth="400" height="90" xOrigin="center" yOrigin="center" yOffset="-5" fontSize="144" loadFontSize="144" layer="12"/>
         <item xOffset="-1440" alpha="0"/>
         <item xOffset="-1440">
@@ -1367,7 +1367,7 @@
 
 
     <!-- Selected Title -->
-    <reloadableText type="title" alpha="0" x="center" y="92" maxWidth="500" xOrigin="center" yOrigin="center" fontColor="75c8f7" fontSize="40" loadFontSize="40" layer="10">
+    <reloadableText type="title" alpha="0" x="center" y="92" maxWidth="1500" xOrigin="center" yOrigin="center" fontColor="75c8f7" fontSize="40" loadFontSize="40" layer="10">
         <onExit>
             <set duration=".25">
                 <animate type="alpha" to="0" algorithm="easeinquadratic"/>
@@ -1756,7 +1756,7 @@
 
 
     <!-- Box Menu -->
-    <menu type="custom" imageType="artwork_front" scrollTime=".35" scrollAcceleration=".04" orientation="horizontal" textFallback="true" x="0" font="fonts/Oswald-Regular.ttf" fontSize="20" loadFontSize="20" width="center" y="980" algorithm="easeincircular">
+    <menu type="custom" imageType="artwork_front" scrollTime=".3" scrollAcceleration=".04" orientation="horizontal" textFallback="true" x="0" font="fonts/Oswald-Regular.ttf" fontSize="20" loadFontSize="20" width="center" y="980" algorithm="easeincircular">
         <itemDefaults alpha="1" x="center" y="980" width="270" maxHeight="340" xOrigin="center" yOrigin="bottom" layer="12" fontSize="50" loadFontSize="50" fontColor="ffffff" reflection="bottom" reflectionDistance="2" reflectionScale="1" reflectionAlpha=".2"/>
         <item xOffset="-1150" alpha="0"/>
         <onExit>
@@ -1943,12 +1943,12 @@
                 <animate type="maxHeight" to="445"/>
             </set>
             <set duration=".24">
-                <animate type="alpha" from="0" to=".9" algorithm="easeinquadratic"/>
+                <animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
             </set>
         </onMenuEnter>
         <onMenuExit menuIndex="1">
             <set duration=".24">
-                <animate type="alpha" from=".9" to="0" algorithm="easeinquadratic"/>
+                <animate type="alpha" from="1" to="0" algorithm="easeinquadratic"/>
             </set>
             <set duration=".01">
                 <animate type="x"         to="1555"/>
@@ -1959,7 +1959,7 @@
         </onMenuExit>
         <onHighlightEnter menuIndex="1">
             <set duration=".25">
-                <animate type="alpha" to=".9" algorithm="easeinquadratic"/>
+                <animate type="alpha" to="1" algorithm="easeinquadratic"/>
             </set>
         </onHighlightEnter>
         <onHighlightExit menuIndex="1">
@@ -1975,7 +1975,7 @@
     <!----------------------------------------------------------------------------------------------------------------------------------->
 
 
-    <reloadableImage type="playlist" mode="common" alpha="0" x="1100" y="430" xOrigin="center" yOrigin="top" maxHeight="40" layer="19">
+    <reloadableImage type="playlist" mode="common" alpha="0" x="1150" y="430" xOrigin="center" yOrigin="top" maxHeight="40" layer="19">
         <onEnter>
             <set duration=".8">
                 <animate type="nop"/>
diff --git a/Package/Environment/Common/layouts/Aeon Nox/video/intro.mp4 b/Package/Environment/Common/layouts/Aeon Nox/video/intro.mp4
index 03ac6f5..611fed3 100644
Binary files a/Package/Environment/Common/layouts/Aeon Nox/video/intro.mp4 and b/Package/Environment/Common/layouts/Aeon Nox/video/intro.mp4 differ
diff --git a/Package/Environment/Common/meta/hyperlist/MAME.xml b/Package/Environment/Common/meta/hyperlist/MAME.xml
index 42b58ec..6622966 100755
--- a/Package/Environment/Common/meta/hyperlist/MAME.xml
+++ b/Package/Environment/Common/meta/hyperlist/MAME.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0"?>
 <menu>
-  <game name="marywu" index="true" image="&">
-    <description>&lt;unknown&gt; Labeled 'WU- MARY-1A' Music by: SunKiss Chen</description>
-    <cloneof></cloneof>
-    <crc>11f67c7d</crc>
-    <manufacturer>&lt;unknown&gt;</manufacturer>
-    <year>????</year>
-    <genre></genre>
-    <rating></rating>
-    <players>1</players>
-    <ctrltype>Keyboard</ctrltype>
-    <buttons>20</buttons>
-    <score></score>
-    <enabled>Yes</enabled>
-  </game>
   <game name="88games" index="true" image="'">
     <description>'88 Games</description>
     <cloneof></cloneof>
@@ -922,6 +908,21 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="openicea" index="" image="">
+    <description>2 On 2 Open Ice Challenge (rev 1.2A)</description>
+    <cloneof>openice</cloneof>
+    <crc>9eaaf93e</crc>
+    <manufacturer>Midway</manufacturer>
+    <year>1995</year>
+    <genre>Sports/Hockey</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>4</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>4.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="2spicy" index="" image="">
     <description>2 Spicy</description>
     <cloneof></cloneof>
@@ -2085,7 +2086,7 @@
   <game name="atvtracka" index="" image="">
     <description>ATV Track (set 2)</description>
     <cloneof>atvtrack</cloneof>
-    <crc>856c1e6a</crc>
+    <crc>752444c7</crc>
     <manufacturer>Gaelco</manufacturer>
     <year>2002</year>
     <genre></genre>
@@ -2724,14 +2725,14 @@
   <game name="adonisa" index="" image="">
     <description>Adonis (0100751V, NSW/ACT)</description>
     <cloneof>adonis</cloneof>
-    <crc>652d544c</crc>
+    <crc>77090858</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1998</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -2757,7 +2758,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -2771,13 +2772,13 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
   <game name="adonisce" index="" image="">
     <description>Adonis - Cash Express (0201005V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>adonis</cloneof>
     <crc>e005a7e8</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1999</year>
@@ -2785,7 +2786,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -3990,6 +3991,20 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="alchemst" index="" image="">
+    <description>Alchemist (01J02046, Venezuela)</description>
+    <cloneof></cloneof>
+    <crc>6b791adf</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2002</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="alchemy" index="" image="">
     <description>Alchemy (1J009611, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -4736,7 +4751,7 @@
     <description>All American Football (rev B)</description>
     <cloneof>aafb</cloneof>
     <crc>119fb1e7</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -4751,7 +4766,7 @@
     <description>All American Football (rev C)</description>
     <cloneof>aafb</cloneof>
     <crc>119fb1e7</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -4766,7 +4781,7 @@
     <description>All American Football (rev D, 2 Players)</description>
     <cloneof>aafb</cloneof>
     <crc>119fb1e7</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -4781,7 +4796,7 @@
     <description>All American Football (rev E)</description>
     <cloneof></cloneof>
     <crc>119fb1e7</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -5202,7 +5217,7 @@
   <game name="altbeast" index="" image="">
     <description>Altered Beast (set 8) (8751 317-0078)</description>
     <cloneof></cloneof>
-    <crc>400c4a36</crc>
+    <crc>8101925f</crc>
     <manufacturer>Sega</manufacturer>
     <year>1988</year>
     <genre>Beat-'Em-Up</genre>
@@ -7169,7 +7184,7 @@
     <description>Area 88 (Japan Resale Ver.)</description>
     <cloneof>unsquad</cloneof>
     <crc>0fbd9270</crc>
-    <manufacturer>Capcom / Daipro</manufacturer>
+    <manufacturer>Capcom</manufacturer>
     <year>1989</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -7184,7 +7199,7 @@
     <description>Area 88 (Japan)</description>
     <cloneof>unsquad</cloneof>
     <crc>ad52b90c</crc>
-    <manufacturer>Capcom / Daipro</manufacturer>
+    <manufacturer>Capcom</manufacturer>
     <year>1989</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -8188,6 +8203,8 @@
     <genre></genre>
     <rating></rating>
     <players>1</players>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>5</buttons>
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -8379,7 +8396,7 @@
     <players>2</players>
     <ctrltype>Doublejoy</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -8394,7 +8411,7 @@
     <players>2</players>
     <ctrltype>Doublejoy</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -8409,7 +8426,7 @@
     <players>2</players>
     <ctrltype>Doublejoy</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -9098,7 +9115,7 @@
     <description>Asylum (prototype)</description>
     <cloneof></cloneof>
     <crc>9a9a361b</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre>Shooter</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -9240,7 +9257,7 @@
     <description>Ataxx (Europe)</description>
     <cloneof>ataxx</cloneof>
     <crc>8df1dee1</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1990</year>
     <genre>Tabletop</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -9254,7 +9271,7 @@
     <description>Ataxx (Japan)</description>
     <cloneof>ataxx</cloneof>
     <crc>8df1dee1</crc>
-    <manufacturer>Leland Corp. (Capcom license)</manufacturer>
+    <manufacturer>Leland Corporation (Capcom license)</manufacturer>
     <year>1990</year>
     <genre>Tabletop</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -9268,7 +9285,7 @@
     <description>Ataxx (set 1)</description>
     <cloneof></cloneof>
     <crc>989cdb8c</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1990</year>
     <genre>Tabletop</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -9282,7 +9299,7 @@
     <description>Ataxx (set 2)</description>
     <cloneof>ataxx</cloneof>
     <crc>989cdb8c</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1990</year>
     <genre>Tabletop</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -9378,7 +9395,7 @@
     <description>Atom (bootleg of Bombjack Twin)</description>
     <cloneof>bjtwin</cloneof>
     <crc>71c74ff9</crc>
-    <manufacturer>bootleg</manufacturer>
+    <manufacturer>bootleg (Kyon K.)</manufacturer>
     <year>1993</year>
     <genre>Platform</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -9854,7 +9871,7 @@
   <game name="aztarac" index="" image="">
     <description>Aztarac</description>
     <cloneof></cloneof>
-    <crc>4016de77</crc>
+    <crc>b8544823</crc>
     <manufacturer>Centuri</manufacturer>
     <year>1983</year>
     <genre>Shoot-'Em-Up</genre>
@@ -10098,6 +10115,20 @@
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="bparty" index="" image="">
+    <description>Bachelorette Party (BHG1248, US)</description>
+    <cloneof></cloneof>
+    <crc>b276d61a</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="backfirt" index="" image="">
     <description>Back Fire (Tecmo, bootleg)</description>
     <cloneof></cloneof>
@@ -10226,7 +10257,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>20</buttons>
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -10298,7 +10329,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -10313,7 +10344,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -10328,7 +10359,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -12017,7 +12048,7 @@
   <game name="battlex" index="" image="">
     <description>Battle Cross</description>
     <cloneof></cloneof>
-    <crc>750a46ef</crc>
+    <crc>126842b7</crc>
     <manufacturer>Omori Electric Co., Ltd.</manufacturer>
     <year>1982</year>
     <genre>Shooter</genre>
@@ -12376,7 +12407,9 @@
     <year>1998</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -12525,7 +12558,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>4</joyways>
+    <joyways>8</joyways>
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -12925,7 +12958,7 @@
     <year>1984</year>
     <genre>Platform</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>1</players>
+    <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
     <joyways>4</joyways>
@@ -14813,7 +14846,7 @@
   <game name="biomtoya" index="" image="">
     <description>Biomechanical Toy (Ver. 1.0.1884)</description>
     <cloneof>biomtoy</cloneof>
-    <crc>914e4bbc</crc>
+    <crc>c3aea660</crc>
     <manufacturer>Gaelco</manufacturer>
     <year>1995</year>
     <genre>Platform</genre>
@@ -15239,7 +15272,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -17554,7 +17587,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -17737,7 +17770,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>3.6</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="bootsctnua" index="" image="">
+    <description>Boot Scootin' (GHG1008-03, US)</description>
+    <cloneof>bootsctn</cloneof>
+    <crc>9759692e</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>25</buttons>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -17751,7 +17798,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -17961,7 +18008,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -17976,7 +18023,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -18109,7 +18156,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -18124,7 +18171,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -18758,7 +18805,7 @@
     <description>Brute Force</description>
     <cloneof></cloneof>
     <crc>508809af</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre>Beat-'Em-Up</genre>
     <rating>AAMA - Yellow (Animated Violence Mild)</rating>
@@ -20571,7 +20618,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -20585,7 +20632,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -20611,7 +20658,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -21189,7 +21236,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -22823,7 +22870,7 @@
     <description>Cannon Ball (Yun Sung, vertical)</description>
     <cloneof>cannball</cloneof>
     <crc>76de1045</crc>
-    <manufacturer>Yun Sung / T&amp;K</manufacturer>
+    <manufacturer>Yun Sung / J&amp;K Production</manufacturer>
     <year>1995</year>
     <genre>Puzzle</genre>
     <rating>AAMA - Red (Sexual Content Strong)</rating>
@@ -25038,9 +25085,37 @@
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="cashcata" index="" image="">
+    <description>Cash Cat (0100557V, NSW/ACT)</description>
+    <cloneof>cashcat</cloneof>
+    <crc>bdeeafd3</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>1.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="cashcat" index="" image="">
-    <description>Cash Cat (0300863V, New Zealand)</description>
+    <description>Cash Cat (0100676V, NSW/ACT)</description>
     <cloneof></cloneof>
+    <crc>a7199f5f</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>1.0</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="cashcatnz" index="" image="">
+    <description>Cash Cat (0300863V, New Zealand)</description>
+    <cloneof>cashcat</cloneof>
     <crc>f930fc07</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1999</year>
@@ -25048,7 +25123,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -25062,7 +25137,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -25076,7 +25151,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -25090,7 +25165,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -25104,7 +25179,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -25188,7 +25263,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -30887,7 +30962,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -31604,7 +31679,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -31618,7 +31693,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -31632,7 +31707,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -32030,7 +32105,7 @@
   <game name="choroqhr" index="" image="">
     <description>Choro Q Hyper Racing 5 (J 981230 V1.000)</description>
     <cloneof></cloneof>
-    <crc>69a71aea</crc>
+    <crc>6e89815f</crc>
     <manufacturer>Sega / Takara</manufacturer>
     <year>1998</year>
     <genre></genre>
@@ -34200,6 +34275,20 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="comotion" index="" image="">
+    <description>CoMOTION</description>
+    <cloneof></cloneof>
+    <crc>53fb8821</crc>
+    <manufacturer>Gremlin</manufacturer>
+    <year>1976</year>
+    <genre>Maze</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>4</players>
+    <ctrltype>Joystick</ctrltype>
+    <joyways>4</joyways>
+    <score>2.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="cobra" index="" image="">
     <description>Cobra Command (Data East LD, set 1)</description>
     <cloneof></cloneof>
@@ -34314,6 +34403,20 @@
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="ladybugb2" index="" image="">
+    <description>Coccinelle (bootleg of Lady Bug, set 2)</description>
+    <cloneof>ladybug</cloneof>
+    <crc>27fa3a50</crc>
+    <manufacturer>bootleg (Model Racing)</manufacturer>
+    <year>1981</year>
+    <genre>Maze</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <joyways>4</joyways>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="cocoloco" index="" image="">
     <description>Coco Loco (set 1)</description>
     <cloneof></cloneof>
@@ -34362,7 +34465,7 @@
   <game name="code1db" index="" image="">
     <description>Code One Dispatch (ver B)</description>
     <cloneof>code1d</cloneof>
-    <crc>fada04dd</crc>
+    <crc>6059cdad</crc>
     <manufacturer>Konami</manufacturer>
     <year>2000</year>
     <genre></genre>
@@ -35012,20 +35115,6 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="comotion" index="" image="">
-    <description>Comotion</description>
-    <cloneof></cloneof>
-    <crc>53fb8821</crc>
-    <manufacturer>Gremlin</manufacturer>
-    <year>1976</year>
-    <genre>Maze</genre>
-    <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>4</players>
-    <ctrltype>Joystick</ctrltype>
-    <joyways>4</joyways>
-    <score>2.0</score>
-    <enabled>Yes</enabled>
-  </game>
   <game name="compgolfo" index="" image="">
     <description>Competition Golf Final Round (Japan, old version)</description>
     <cloneof>compgolf</cloneof>
@@ -35089,7 +35178,7 @@
   <game name="condorn" index="" image="">
     <description>Condor (S C Novar bootleg of Phoenix)</description>
     <cloneof>phoenix</cloneof>
-    <crc>e176b768</crc>
+    <crc>c68a49bc</crc>
     <manufacturer>bootleg (S C Novar)</manufacturer>
     <year>1981</year>
     <genre>Shoot-'Em-Up</genre>
@@ -37296,7 +37385,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -38472,7 +38561,7 @@
   <game name="crakndj2" index="" image="">
     <description>Crackin' DJ Part 2 (Japan)</description>
     <cloneof></cloneof>
-    <crc>aabcd580</crc>
+    <crc>08f27149</crc>
     <manufacturer>Sega</manufacturer>
     <year>2001</year>
     <genre></genre>
@@ -42355,21 +42444,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
   <game name="cuckoou" index="" image="">
     <description>Cuckoo (CHG1195, US)</description>
     <cloneof>cuckoo</cloneof>
-    <crc>00bb7597</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>2000</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -42541,7 +42630,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Stick</ctrltype>
-    <buttons>4</buttons>
+    <buttons>3</buttons>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -42555,7 +42644,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Stick</ctrltype>
-    <buttons>4</buttons>
+    <buttons>3</buttons>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -43618,7 +43707,7 @@
   </game>
   <game name="dankuga" index="" image="">
     <description>Dan-Ku-Ga (Ver 0.0J 1994/12/13, prototype)</description>
-    <cloneof>kaiserkn</cloneof>
+    <cloneof></cloneof>
     <crc>31ceb152</crc>
     <manufacturer>Taito Corporation</manufacturer>
     <year>1994</year>
@@ -44127,7 +44216,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="danchiq" index="" image="">
-    <description>Danchi de Quiz Okusan Yontaku Desuyo! (J 001128 V1.200)</description>
+    <description>Danchi de Quiz: Okusan Yontaku Desuyo! (J 001128 V1.200)</description>
     <cloneof></cloneof>
     <crc>9a4109e5</crc>
     <manufacturer>Altron</manufacturer>
@@ -44343,7 +44432,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -44358,7 +44447,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -44396,7 +44485,7 @@
     <description>Danny Sullivan's Indy Heat</description>
     <cloneof></cloneof>
     <crc>896f7257</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -44543,7 +44632,7 @@
   </game>
   <game name="dariusgx" index="" image="">
     <description>Darius Gaiden - Silver Hawk Extra Version (Ver 2.7J 1995/03/06) (Official Hack)</description>
-    <cloneof>dariusg</cloneof>
+    <cloneof></cloneof>
     <crc>9250abae</crc>
     <manufacturer>Taito Corporation</manufacturer>
     <year>1994</year>
@@ -44758,7 +44847,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -45421,7 +45510,7 @@
   </game>
   <game name="doa2" index="" image="">
     <description>Dead or Alive 2</description>
-    <cloneof></cloneof>
+    <cloneof>doa2m</cloneof>
     <crc>3a119a17</crc>
     <manufacturer>Tecmo</manufacturer>
     <year>1999</year>
@@ -45436,7 +45525,7 @@
   </game>
   <game name="doa2a" index="" image="">
     <description>Dead or Alive 2 (Rev A)</description>
-    <cloneof>doa2</cloneof>
+    <cloneof>doa2m</cloneof>
     <crc>3a119a17</crc>
     <manufacturer>Tecmo</manufacturer>
     <year>1999</year>
@@ -45451,7 +45540,7 @@
   </game>
   <game name="doa2m" index="" image="">
     <description>Dead or Alive 2 Millennium</description>
-    <cloneof>doa2</cloneof>
+    <cloneof></cloneof>
     <crc>3a119a17</crc>
     <manufacturer>Tecmo</manufacturer>
     <year>2000</year>
@@ -49448,9 +49537,9 @@
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="dstbloom" index="" image="">
+  <game name="dstblooma" index="" image="">
     <description>Desert Bloom (0200111V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>dstbloom</cloneof>
     <crc>0ad41815</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1995</year>
@@ -49458,7 +49547,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>2.8</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="dstbloom" index="" image="">
+    <description>Desert Bloom (0300111V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>10cf45b3</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -49950,7 +50053,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -49988,7 +50091,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score></score>
     <enabled>Yes</enabled>
   </game>
@@ -50099,9 +50202,9 @@
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>4.1</score>
     <enabled>Yes</enabled>
   </game>
@@ -50707,7 +50810,7 @@
     <cloneof></cloneof>
     <crc>553dd361</crc>
     <manufacturer>Sammy</manufacturer>
-    <year>2004</year>
+    <year>2006</year>
     <genre></genre>
     <rating></rating>
     <players>2</players>
@@ -51741,6 +51844,21 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="dodgeman" index="" image="">
+    <description>Dodge Man</description>
+    <cloneof></cloneof>
+    <crc>c9a515df</crc>
+    <manufacturer>Omori Electric Co., Ltd.</manufacturer>
+    <year>1983</year>
+    <genre>Shooter</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="dodgem" index="" image="">
     <description>Dodgem</description>
     <cloneof></cloneof>
@@ -51972,7 +52090,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -51986,7 +52104,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -52000,21 +52118,63 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
   <game name="dolphntru" index="" image="">
     <description>Dolphin Treasure (FHG4077-02, US)</description>
     <cloneof>dolphntr</cloneof>
-    <crc>8ee1c2d3</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1996</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="dolphntrceb" index="" image="">
+    <description>Dolphin Treasure - Cash Express (AHG1519, US)</description>
+    <cloneof>dolphntr</cloneof>
+    <crc>f2da081c</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="dolphntrcea" index="" image="">
+    <description>Dolphin Treasure - Cash Express (AHG1606, US)</description>
+    <cloneof>dolphntr</cloneof>
+    <crc>c6c59ed6</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="dolphntrce" index="" image="">
+    <description>Dolphin Treasure - Cash Express (AHG1607, US)</description>
+    <cloneof>dolphntr</cloneof>
+    <crc>6f522ffb</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -52517,6 +52677,21 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="dkong3abl" index="" image="">
+    <description>Donkey Kong 3 (bootleg on Ambush hardware)</description>
+    <cloneof>dkong3</cloneof>
+    <crc>66a77f40</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>1983</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
+    <score>3.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="dkong3b" index="" image="">
     <description>Donkey Kong 3 (bootleg on Donkey Kong Jr. hardware)</description>
     <cloneof>dkong3</cloneof>
@@ -52532,21 +52707,6 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="dkong3abl" index="" image="">
-    <description>Donkey Kong 3 (bootleg with 2xAY8910)</description>
-    <cloneof>dkong3</cloneof>
-    <crc>afc9bd41</crc>
-    <manufacturer>bootleg</manufacturer>
-    <year>1983</year>
-    <genre>Platform</genre>
-    <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>2</players>
-    <ctrltype>Joystick</ctrltype>
-    <buttons>2</buttons>
-    <joyways>8</joyways>
-    <score>3.8</score>
-    <enabled>Yes</enabled>
-  </game>
   <game name="dkongf" index="" image="">
     <description>Donkey Kong Foundry (hack)</description>
     <cloneof>dkong</cloneof>
@@ -54630,6 +54790,20 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="drgneye" index="" image="">
+    <description>Dragon's Eye (0100521V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>2bb47749</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="dragonsh" index="" image="">
     <description>Dragon's Heaven (development board)</description>
     <cloneof></cloneof>
@@ -54829,7 +55003,7 @@
     <description>Dragon's Lair 2: Time Warp (Euro v3.12)</description>
     <cloneof>dlair2</cloneof>
     <crc>c842be6b</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54841,7 +55015,7 @@
     <description>Dragon's Lair 2: Time Warp (Euro v3.16)</description>
     <cloneof>dlair2</cloneof>
     <crc>d68f1b13</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54853,7 +55027,7 @@
     <description>Dragon's Lair 2: Time Warp (Euro v3.17)</description>
     <cloneof>dlair2</cloneof>
     <crc>743f65a5</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54865,7 +55039,7 @@
     <description>Dragon's Lair 2: Time Warp (Euro v3.19)</description>
     <cloneof>dlair2</cloneof>
     <crc>cc23ad9f</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54877,7 +55051,7 @@
     <description>Dragon's Lair 2: Time Warp (Spanish v3.15)</description>
     <cloneof>dlair2</cloneof>
     <crc>75d8861a</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54889,7 +55063,7 @@
     <description>Dragon's Lair 2: Time Warp (Spanish v3.19)</description>
     <cloneof>dlair2</cloneof>
     <crc>4b9a811d</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54901,7 +55075,7 @@
     <description>Dragon's Lair 2: Time Warp (US v2.00, AMOA prototype)</description>
     <cloneof>dlair2</cloneof>
     <crc>1fc21576</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54913,7 +55087,7 @@
     <description>Dragon's Lair 2: Time Warp (US v2.11)</description>
     <cloneof>dlair2</cloneof>
     <crc>9f2660a3</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54925,7 +55099,7 @@
     <description>Dragon's Lair 2: Time Warp (US v3.00)</description>
     <cloneof>dlair2</cloneof>
     <crc>dec4f2e3</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54937,7 +55111,7 @@
     <description>Dragon's Lair 2: Time Warp (US v3.14)</description>
     <cloneof>dlair2</cloneof>
     <crc>af92b612</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54949,7 +55123,7 @@
     <description>Dragon's Lair 2: Time Warp (US v3.15)</description>
     <cloneof>dlair2</cloneof>
     <crc>13ec0600</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54961,7 +55135,7 @@
     <description>Dragon's Lair 2: Time Warp (US v3.18)</description>
     <cloneof>dlair2</cloneof>
     <crc>64706492</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -54973,7 +55147,7 @@
     <description>Dragon's Lair 2: Time Warp (US v3.19)</description>
     <cloneof></cloneof>
     <crc>e9453a1b</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -55498,6 +55672,20 @@
     <score>2.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="dreamwv" index="" image="">
+    <description>Dream Weaver (0200586V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>0b3e03d3</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="dreamwld" index="" image="">
     <description>Dream World</description>
     <cloneof></cloneof>
@@ -55680,9 +55868,10 @@
     <year>1991</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Pedal</ctrltype>
-    <joyways>vertical2</joyways>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -56217,6 +56406,21 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="ddsomjr2" index="" image="">
+    <description>Dungeons &amp; Dragons: Shadow over Mystara (Japan 960223)</description>
+    <cloneof>ddsom</cloneof>
+    <crc>d8dadb22</crc>
+    <manufacturer>Capcom</manufacturer>
+    <year>1996</year>
+    <genre>Beat-'Em-Up</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>4</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>3.7</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="ddsomj" index="" image="">
     <description>Dungeons &amp; Dragons: Shadow over Mystara (Japan 960619)</description>
     <cloneof>ddsom</cloneof>
@@ -56620,11 +56824,11 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dynablstb" index="" image="">
-    <description>Dynablaster / Bomber Man (bootleg)</description>
+    <description>Dynablaster / Bomber Man (bootleg, set 1)</description>
     <cloneof>dynablst</cloneof>
     <crc>3c3613af</crc>
     <manufacturer>bootleg (Seitu)</manufacturer>
-    <year>1991</year>
+    <year>1992</year>
     <genre>Maze</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
@@ -56635,11 +56839,26 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dynablstb2" index="" image="">
-    <description>Dynablaster / Bomber Man (bootleg, alt)</description>
+    <description>Dynablaster / Bomber Man (bootleg, set 2)</description>
     <cloneof>dynablst</cloneof>
     <crc>3c3613af</crc>
     <manufacturer>bootleg (Seitu)</manufacturer>
-    <year>1991</year>
+    <year>1992</year>
+    <genre>Maze</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>4</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="dynablstb3" index="" image="">
+    <description>Dynablaster / Bomber Man (bootleg, set 3)</description>
+    <cloneof>dynablst</cloneof>
+    <crc>3c3613af</crc>
+    <manufacturer>bootleg (Seitu)</manufacturer>
+    <year>1992</year>
     <genre>Maze</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
@@ -56930,7 +57149,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dynduke" index="" image="">
-    <description>Dynamite Duke (Europe set 1)</description>
+    <description>Dynamite Duke (Europe, 03SEP89)</description>
     <cloneof></cloneof>
     <crc>9cbc7b41</crc>
     <manufacturer>Seibu Kaihatsu</manufacturer>
@@ -56945,7 +57164,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dyndukea" index="" image="">
-    <description>Dynamite Duke (Europe set 2)</description>
+    <description>Dynamite Duke (Europe, 25JUL89)</description>
     <cloneof>dynduke</cloneof>
     <crc>9cbc7b41</crc>
     <manufacturer>Seibu Kaihatsu</manufacturer>
@@ -56960,7 +57179,22 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dyndukej" index="" image="">
-    <description>Dynamite Duke (Japan)</description>
+    <description>Dynamite Duke (Japan, 03SEP89)</description>
+    <cloneof>dynduke</cloneof>
+    <crc>9cbc7b41</crc>
+    <manufacturer>Seibu Kaihatsu</manufacturer>
+    <year>1989</year>
+    <genre>Shooter</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>3.8</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="dyndukeja" index="" image="">
+    <description>Dynamite Duke (Japan, 25JUL89)</description>
     <cloneof>dynduke</cloneof>
     <crc>9cbc7b41</crc>
     <manufacturer>Seibu Kaihatsu</manufacturer>
@@ -56975,7 +57209,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dyndukeu" index="" image="">
-    <description>Dynamite Duke (US)</description>
+    <description>Dynamite Duke (US, 25JUL89)</description>
     <cloneof>dynduke</cloneof>
     <crc>9cbc7b41</crc>
     <manufacturer>Seibu Kaihatsu (Fabtek license)</manufacturer>
@@ -57089,7 +57323,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -57758,6 +57992,21 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="eeekk" index="" image="">
+    <description>Eeekk!</description>
+    <cloneof></cloneof>
+    <crc>77245b66</crc>
+    <manufacturer>Epos Corporation</manufacturer>
+    <year>1984</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>4</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="egghunt" index="" image="">
     <description>Egg Hunt</description>
     <cloneof></cloneof>
@@ -58058,7 +58307,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -58537,7 +58786,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -58593,7 +58842,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -58814,6 +59063,20 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="enmadaio" index="" image="">
+    <description>Enma Daio (Japan)</description>
+    <cloneof></cloneof>
+    <crc>6b8717c3</crc>
+    <manufacturer>Toaplan / Taito</manufacturer>
+    <year>1993</year>
+    <genre>Quiz</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Dial</ctrltype>
+    <buttons>2</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="equites" index="" image="">
     <description>Equites</description>
     <cloneof></cloneof>
@@ -59234,7 +59497,9 @@
     <year>1998</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -59246,7 +59511,9 @@
     <year>1998</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -59447,7 +59714,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Trackball</ctrltype>
-    <buttons>11</buttons>
+    <buttons>3</buttons>
     <score>4.1</score>
     <enabled>Yes</enabled>
   </game>
@@ -59461,7 +59728,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Trackball</ctrltype>
-    <buttons>11</buttons>
+    <buttons>3</buttons>
     <score>4.1</score>
     <enabled>Yes</enabled>
   </game>
@@ -59942,7 +60209,7 @@
     <cloneof></cloneof>
     <crc>2f578ea4</crc>
     <manufacturer>Sammy</manufacturer>
-    <year>2005</year>
+    <year>2004</year>
     <genre></genre>
     <rating></rating>
     <players>2</players>
@@ -59998,9 +60265,9 @@
     <enabled>Yes</enabled>
   </game>
   <game name="mag_exzi" index="" image="">
-    <description>Exzisus (EX 1.0, Magnet System, prototype)</description>
+    <description>Exzisus (EX 1.0, Magnet System)</description>
     <cloneof></cloneof>
-    <crc>1ac7409e</crc>
+    <crc>3705e9dc</crc>
     <manufacturer>EFO SA / Cedar</manufacturer>
     <year>1987</year>
     <genre>Shoot-'Em-Up</genre>
@@ -60663,7 +60930,7 @@
     <description>Falcon (bootleg of Phoenix) (Z80 CPU)</description>
     <cloneof>phoenix</cloneof>
     <crc>e176b768</crc>
-    <manufacturer>bootleg</manufacturer>
+    <manufacturer>bootleg (Digimatic)</manufacturer>
     <year>1980</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -61432,6 +61699,20 @@
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="fastfort" index="" image="">
+    <description>Fast Fortune (0100651V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>d591dfb6</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="fastfred" index="" image="">
     <description>Fast Freddie</description>
     <cloneof>flyboy</cloneof>
@@ -61803,7 +62084,7 @@
     <description>Fenix (bootleg of Phoenix)</description>
     <cloneof>phoenix</cloneof>
     <crc>e176b768</crc>
-    <manufacturer>bootleg</manufacturer>
+    <manufacturer>bootleg (Orio)</manufacturer>
     <year>1980</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -62665,6 +62946,21 @@
     <score>4.1</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="ffantasyb" index="" image="">
+    <description>Fighting Fantasy (Japan revision ?)</description>
+    <cloneof>hippodrm</cloneof>
+    <crc>b606924d</crc>
+    <manufacturer>Data East Corporation</manufacturer>
+    <year>1989</year>
+    <genre>Fighter</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>5</buttons>
+    <joyways>8</joyways>
+    <score>3.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="ffantasya" index="" image="">
     <description>Fighting Fantasy (Japan)</description>
     <cloneof>hippodrm</cloneof>
@@ -64839,6 +65135,21 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="cfboy0a1" index="" image="">
+    <description>Flash Boy (vertical) [DECO Cassette MD] (No.12/Ver.0/Set.1,Japan)</description>
+    <cloneof></cloneof>
+    <crc>1bc9fccb</crc>
+    <manufacturer>Data East Corporation</manufacturer>
+    <year>1981</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Stick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="fpointbj" index="" image="">
     <description>Flash Point (Japan, bootleg)</description>
     <cloneof>fpoint</cloneof>
@@ -64944,6 +65255,21 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="flashgalk" index="" image="">
+    <description>Flashgal (set 1, Kyugo logo)</description>
+    <cloneof>flashgal</cloneof>
+    <crc>83a39201</crc>
+    <manufacturer>Kyugo / Sega</manufacturer>
+    <year>1985</year>
+    <genre>Beat-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>3.6</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="flashgala" index="" image="">
     <description>Flashgal (set 2)</description>
     <cloneof>flashgal</cloneof>
@@ -64960,7 +65286,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="flicky" index="" image="">
-    <description>Flicky (128k Version, System 2, 315-5051)</description>
+    <description>Flicky (128k Version, 315-5051)</description>
     <cloneof></cloneof>
     <crc>648350b8</crc>
     <manufacturer>Sega</manufacturer>
@@ -64974,8 +65300,23 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="flickya" index="" image="">
+    <description>Flicky (128k Version, 315-5051, larger roms)</description>
+    <cloneof>flicky</cloneof>
+    <crc>648350b8</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1984</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>2</joyways>
+    <score>3.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="flickys2" index="" image="">
-    <description>Flicky (128k Version, System 2, not encrypted)</description>
+    <description>Flicky (128k Version, not encrypted)</description>
     <cloneof>flicky</cloneof>
     <crc>648350b8</crc>
     <manufacturer>Sega</manufacturer>
@@ -64990,7 +65331,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="flickyo" index="" image="">
-    <description>Flicky (64k Version, System 1, 315-5051, set 1)</description>
+    <description>Flicky (64k Version, 315-5051, set 1)</description>
     <cloneof>flicky</cloneof>
     <crc>648350b8</crc>
     <manufacturer>Sega</manufacturer>
@@ -65005,7 +65346,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="flickys1" index="" image="">
-    <description>Flicky (64k Version, System 1, 315-5051, set 2)</description>
+    <description>Flicky (64k Version, 315-5051, set 2)</description>
     <cloneof>flicky</cloneof>
     <crc>648350b8</crc>
     <manufacturer>Sega</manufacturer>
@@ -65778,7 +66119,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -68806,9 +69147,10 @@
     <year>1998</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keyboard</ctrltype>
-    <buttons>73</buttons>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
@@ -69044,15 +69386,15 @@
   </game>
   <game name="futflash" index="" image="">
     <description>Future Flash</description>
-    <cloneof>laserbas</cloneof>
+    <cloneof></cloneof>
     <crc>623f558f</crc>
     <manufacturer>Hoei</manufacturer>
-    <year>1981</year>
-    <genre></genre>
-    <rating></rating>
-    <players>1</players>
-    <ctrltype>Trackball</ctrltype>
-    <buttons>2</buttons>
+    <year>1980</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>1</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -70272,7 +70614,7 @@
   <game name="galgame2" index="" image="">
     <description>Galaxy Games StarPak 2</description>
     <cloneof></cloneof>
-    <crc>63ec1224</crc>
+    <crc>bb253913</crc>
     <manufacturer>Creative Electronics &amp; Software / Namco</manufacturer>
     <year>1998</year>
     <genre>Compilation</genre>
@@ -70283,6 +70625,20 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="galgame3" index="" image="">
+    <description>Galaxy Games StarPak 3</description>
+    <cloneof></cloneof>
+    <crc>cf901ed8</crc>
+    <manufacturer>Creative Electronics &amp; Software / Atari</manufacturer>
+    <year>1998</year>
+    <genre>Compilation</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Trackball</ctrltype>
+    <buttons>2</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="galaxygn" index="" image="">
     <description>Galaxy Gunners</description>
     <cloneof></cloneof>
@@ -70505,14 +70861,14 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="glpracr2j" index="" image="">
-    <description>Gallop Racer 2 (Japan)</description>
-    <cloneof>glpracr2</cloneof>
+  <game name="glpracr2" index="" image="">
+    <description>Gallop Racer 2 (Export)</description>
+    <cloneof></cloneof>
     <crc>ce1d5558</crc>
     <manufacturer>Tecmo</manufacturer>
     <year>1997</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Sports/Horse Racing</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
@@ -70520,14 +70876,14 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="glpracr2" index="" image="">
-    <description>Gallop Racer 2 (USA)</description>
-    <cloneof></cloneof>
+  <game name="glpracr2j" index="" image="">
+    <description>Gallop Racer 2 (Japan)</description>
+    <cloneof>glpracr2</cloneof>
     <crc>ce1d5558</crc>
     <manufacturer>Tecmo</manufacturer>
     <year>1997</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Sports/Horse Racing</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
@@ -70541,8 +70897,8 @@
     <crc>ce1d5558</crc>
     <manufacturer>Tecmo</manufacturer>
     <year>1997</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Sports/Horse Racing</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
@@ -70670,7 +71026,22 @@
     <enabled>Yes</enabled>
   </game>
   <game name="galpanica" index="" image="">
-    <description>Gals Panic (MCU Protected)</description>
+    <description>Gals Panic (MCU Protected, set 1)</description>
+    <cloneof>galpanic</cloneof>
+    <crc>c7ed7950</crc>
+    <manufacturer>Kaneko</manufacturer>
+    <year>1990</year>
+    <genre>Puzzle</genre>
+    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>4</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="galpanicb" index="" image="">
+    <description>Gals Panic (MCU Protected, set 2)</description>
     <cloneof>galpanic</cloneof>
     <crc>c7ed7950</crc>
     <manufacturer>Kaneko</manufacturer>
@@ -71030,7 +71401,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="galpans2" index="" image="">
-    <description>Gals Panic S2 (Japan)</description>
+    <description>Gals Panic S2 (Europe)</description>
     <cloneof></cloneof>
     <crc>0348e8e1</crc>
     <manufacturer>Kaneko</manufacturer>
@@ -71044,6 +71415,21 @@
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="galpans2j" index="" image="">
+    <description>Gals Panic S2 (Japan)</description>
+    <cloneof>galpans2</cloneof>
+    <crc>0348e8e1</crc>
+    <manufacturer>Kaneko</manufacturer>
+    <year>1999</year>
+    <genre>Puzzle</genre>
+    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="galpans3" index="" image="">
     <description>Gals Panic S3 (Japan)</description>
     <cloneof></cloneof>
@@ -72974,12 +73360,27 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="gamsharaj" index="" image="">
+    <description>Gamshara (Japan, 10021 Ver.A)</description>
+    <cloneof>gamshara</cloneof>
+    <crc>73669ff7</crc>
+    <manufacturer>Mitchell</manufacturer>
+    <year>2002</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score>3.7</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="gamshara" index="" image="">
-    <description>Gamshara (10021 Ver.A)</description>
+    <description>Gamshara (World, 10021 Ver.A)</description>
     <cloneof></cloneof>
     <crc>73669ff7</crc>
     <manufacturer>Mitchell</manufacturer>
-    <year>2003</year>
+    <year>2002</year>
     <genre></genre>
     <rating></rating>
     <players>2</players>
@@ -74162,7 +74563,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -74343,9 +74744,9 @@
     <year>1999</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -75470,7 +75871,7 @@
   <game name="gladiatr" index="" image="">
     <description>Gladiator (US)</description>
     <cloneof></cloneof>
-    <crc>e325808e</crc>
+    <crc>3c5ca4c6</crc>
     <manufacturer>Allumer / Taito America Corporation</manufacturer>
     <year>1986</year>
     <genre>Beat-'Em-Up</genre>
@@ -75928,7 +76329,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -76899,7 +77300,7 @@
   <game name="goldnaxe2" index="" image="">
     <description>Golden Axe (set 2, US) (8751 317-0112)</description>
     <cloneof>goldnaxe</cloneof>
-    <crc>6218d8e7</crc>
+    <crc>d8f2f1c0</crc>
     <manufacturer>Sega</manufacturer>
     <year>1989</year>
     <genre>Beat-'Em-Up</genre>
@@ -77004,7 +77405,7 @@
   <game name="goldnaxe" index="" image="">
     <description>Golden Axe (set 6, US) (8751 317-123A)</description>
     <cloneof></cloneof>
-    <crc>6218d8e7</crc>
+    <crc>cf19e7d4</crc>
     <manufacturer>Sega</manufacturer>
     <year>1989</year>
     <genre>Beat-'Em-Up</genre>
@@ -77194,7 +77595,7 @@
   <game name="gcastle" index="" image="">
     <description>Golden Castle (prototype?)</description>
     <cloneof>gladiatr</cloneof>
-    <crc>e325808e</crc>
+    <crc>3c5ca4c6</crc>
     <manufacturer>Allumer / Taito Corporation</manufacturer>
     <year>1986</year>
     <genre>Beat-'Em-Up</genre>
@@ -77220,6 +77621,20 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="gldncrwnhop" index="" image="">
+    <description>Golden Crown Hopper (Dutch, Game Card)</description>
+    <cloneof>gldncrwn</cloneof>
+    <crc>4edd5a1d</crc>
+    <manufacturer>BFM/ELAM</manufacturer>
+    <year>1997</year>
+    <genre>Casino</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>6</buttons>
+    <score>4.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="gfire2" index="" image="">
     <description>Golden Fire II</description>
     <cloneof></cloneof>
@@ -77930,6 +78345,20 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="goldpyrb" index="" image="">
+    <description>Golden Pyramids (0100878V, Victoria)</description>
+    <cloneof>goldpyr</cloneof>
+    <crc>0df660be</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="goldpyr" index="" image="">
     <description>Golden Pyramids (AHG1205-03, US)</description>
     <cloneof></cloneof>
@@ -77940,7 +78369,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -77954,7 +78383,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -77980,7 +78409,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -80474,8 +80903,8 @@
   <game name="polepos2bs" index="" image="">
     <description>Gran Premio F1 (Spanish bootleg of Pole Position II)</description>
     <cloneof>polepos2</cloneof>
-    <crc>269c1af4</crc>
-    <manufacturer>BCN Internacional S.A.)</manufacturer>
+    <crc>47226cda</crc>
+    <manufacturer>bootleg (BCN Internacional S.A.)</manufacturer>
     <year>1984</year>
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -80710,7 +81139,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="gcpinbal" index="" image="">
-    <description>Grand Cross</description>
+    <description>Grand Cross v1.02F</description>
     <cloneof></cloneof>
     <crc>092b2c0f</crc>
     <manufacturer>Excellent System</manufacturer>
@@ -81984,10 +82413,25 @@
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="griffon" index="" image="">
-    <description>Griffon (bootleg of Phoenix)</description>
+  <game name="griffono" index="" image="">
+    <description>Griffon (Olympia bootleg of Phoenix)</description>
     <cloneof>phoenix</cloneof>
-    <crc>e176b768</crc>
+    <crc>c68a49bc</crc>
+    <manufacturer>bootleg (Olympia)</manufacturer>
+    <year>1980</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>2</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="griffon" index="" image="">
+    <description>Griffon (Videotron bootleg of Phoenix)</description>
+    <cloneof>phoenix</cloneof>
+    <crc>c68a49bc</crc>
     <manufacturer>bootleg (Videotron)</manufacturer>
     <year>1980</year>
     <genre>Shoot-'Em-Up</genre>
@@ -82419,7 +82863,7 @@
     <cloneof></cloneof>
     <crc>325cf843</crc>
     <manufacturer>Arc System Works / Sammy</manufacturer>
-    <year>2003</year>
+    <year>2004</year>
     <genre></genre>
     <rating></rating>
     <players>2</players>
@@ -84627,14 +85071,14 @@
     <genre>Tabletop</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>1</players>
-    <ctrltype>Hanafuda</ctrltype>
-    <buttons>10</buttons>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>1</buttons>
     <score>4.6</score>
     <enabled>Yes</enabled>
   </game>
   <game name="hndlchmp" index="" image="">
     <description>Handle Champ (GQ710 VER. JAB)</description>
-    <cloneof></cloneof>
+    <cloneof>strgchmp</cloneof>
     <crc>b784de91</crc>
     <manufacturer>Konami</manufacturer>
     <year>1997</year>
@@ -84814,6 +85258,21 @@
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="hangzo" index="" image="">
+    <description>Hangzo (Japan, prototype)</description>
+    <cloneof></cloneof>
+    <crc>b7a7baad</crc>
+    <manufacturer>Hot-B</manufacturer>
+    <year>1992</year>
+    <genre>Beat-'Em-Up</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="happy6101" index="" image="">
     <description>Happy 6-in-1 (ver. 101CN)</description>
     <cloneof>happy6</cloneof>
@@ -84844,6 +85303,18 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="hapyfsh2" index="" image="">
+    <description>Happy Fish (V2 PCB, 302-in-1)</description>
+    <cloneof></cloneof>
+    <crc>f00a25cd</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>201?</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sc4hf" index="" image="">
     <description>Happy Fruits (Bellfruit) (Scorpion 4) (set 1)</description>
     <cloneof></cloneof>
@@ -86341,6 +86812,21 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="hedpanica" index="" image="">
+    <description>Head Panic (ver. 0702, 02/07/1999)</description>
+    <cloneof>hedpanic</cloneof>
+    <crc>e91f4038</crc>
+    <manufacturer>ESD</manufacturer>
+    <year>1999</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>3.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="heartatk" index="" image="">
     <description>Heart Attack</description>
     <cloneof></cloneof>
@@ -86388,7 +86874,9 @@
     <year>1998</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -86794,7 +87282,9 @@
     <year>1998</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>2.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -91445,7 +91935,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -91459,7 +91949,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -91473,21 +91963,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
   <game name="incasunu" index="" image="">
     <description>Inca Sun (CHG1458, US)</description>
     <cloneof>incasun</cloneof>
-    <crc>2e573a8d</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>2000</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -91545,7 +92035,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -92659,7 +93149,7 @@
     <description>Ironman Ivan Stewart's Super Off-Road</description>
     <cloneof></cloneof>
     <crc>57955248</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -92673,7 +93163,7 @@
     <description>Ironman Ivan Stewart's Super Off-Road Track-Pak</description>
     <cloneof></cloneof>
     <crc>57955248</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -92687,7 +93177,7 @@
     <description>Ironman Ivan Stewart's Super Off-Road Track-Pak (2 Players)</description>
     <cloneof>offroadt</cloneof>
     <crc>57955248</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1989</year>
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -95288,7 +95778,7 @@
     <description>John Elway's Team Quarterback (set 1)</description>
     <cloneof></cloneof>
     <crc>119fb1e7</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1988</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -95303,7 +95793,7 @@
     <description>John Elway's Team Quarterback (set 2)</description>
     <cloneof>teamqb</cloneof>
     <crc>119fb1e7</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1988</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -95322,7 +95812,7 @@
     <year>2004</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -96496,6 +96986,20 @@
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="jumpjoey" index="" image="">
+    <description>Jumpin' Joey (0100383V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>defce2e9</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="jumping" index="" image="">
     <description>Jumping (set 1)</description>
     <cloneof>rbisland</cloneof>
@@ -97158,7 +97662,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score></score>
     <enabled>Yes</enabled>
   </game>
@@ -97456,7 +97960,21 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="kgbirda" index="true" image="K">
+  <game name="kgbirda5" index="true" image="K">
+    <description>K.G. Bird (0200024V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>df176c5a</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1994</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="kgbirda" index="" image="">
     <description>K.G. Bird (4VXFC5341, New Zealand, 10c)</description>
     <cloneof>kgbird</cloneof>
     <crc>ef25f5cc</crc>
@@ -97484,6 +98002,18 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="kofskyst" index="" image="">
+    <description>KOF Sky Stage (v1.00J)</description>
+    <cloneof></cloneof>
+    <crc></crc>
+    <manufacturer>Moss / SNK Playmore</manufacturer>
+    <year>2010</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="kabukizj" index="" image="">
     <description>Kabuki-Z (Japan)</description>
     <cloneof>kabukiz</cloneof>
@@ -98058,6 +98588,21 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="karnovjbl" index="" image="">
+    <description>Karnov (Japan, bootleg with NEC D8748HD)</description>
+    <cloneof>karnov</cloneof>
+    <crc>02f78ffb</crc>
+    <manufacturer>bootleg (K. J. Corporation)</manufacturer>
+    <year>1987</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>3.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="karnova" index="" image="">
     <description>Karnov (US, rev 5)</description>
     <cloneof>karnov</cloneof>
@@ -98721,7 +99266,7 @@
   <game name="kick4csh" index="" image="">
     <description>Kick '4' Cash (Export)</description>
     <cloneof></cloneof>
-    <crc>19d77c96</crc>
+    <crc>f30839ad</crc>
     <manufacturer>Sega</manufacturer>
     <year>2004</year>
     <genre></genre>
@@ -98966,7 +99511,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -98981,7 +99526,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -99279,6 +99824,20 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="kgalaha" index="" image="">
+    <description>King Galah (0100536V, NSW/ACT)</description>
+    <cloneof>kgalah</cloneof>
+    <crc>ddde1739</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="kgalah" index="" image="">
     <description>King Galah (0200536V, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -99289,7 +99848,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -99585,6 +100144,21 @@
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="kotm2a" index="" image="">
+    <description>King of the Monsters 2 - The Next Thing (older)</description>
+    <cloneof>kotm2</cloneof>
+    <crc>81c9c250</crc>
+    <manufacturer>SNK</manufacturer>
+    <year>1992</year>
+    <genre>Beat-'Em-Up</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>3.1</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="kotm2p" index="" image="">
     <description>King of the Monsters 2 - The Next Thing (prototype)</description>
     <cloneof>kotm2</cloneof>
@@ -99834,7 +100408,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -99849,7 +100423,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -99894,7 +100468,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -99909,7 +100483,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -99924,7 +100498,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -99939,7 +100513,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -100231,6 +100805,66 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="kov3hd101" index="" image="">
+    <description>Knights of Valour 3 HD (V101)</description>
+    <cloneof>kov3hd</cloneof>
+    <crc></crc>
+    <manufacturer>IGS</manufacturer>
+    <year>2011</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="kov3hd102" index="" image="">
+    <description>Knights of Valour 3 HD (V102)</description>
+    <cloneof>kov3hd</cloneof>
+    <crc></crc>
+    <manufacturer>IGS</manufacturer>
+    <year>2011</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="kov3hd103" index="" image="">
+    <description>Knights of Valour 3 HD (V103)</description>
+    <cloneof>kov3hd</cloneof>
+    <crc></crc>
+    <manufacturer>IGS</manufacturer>
+    <year>2011</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="kov3hd104" index="" image="">
+    <description>Knights of Valour 3 HD (V104)</description>
+    <cloneof>kov3hd</cloneof>
+    <crc></crc>
+    <manufacturer>IGS</manufacturer>
+    <year>2011</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="kov3hd" index="" image="">
+    <description>Knights of Valour 3 HD (V105)</description>
+    <cloneof></cloneof>
+    <crc></crc>
+    <manufacturer>IGS</manufacturer>
+    <year>2011</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="kovplus" index="" image="">
     <description>Knights of Valour Plus / Sangoku Senki Plus (ver. 119, set 1)</description>
     <cloneof></cloneof>
@@ -100834,7 +101468,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -101214,7 +101848,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -102092,20 +102726,6 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="ladybgb2" index="" image="">
-    <description>Lady Bug (bootleg set 2)</description>
-    <cloneof>ladybug</cloneof>
-    <crc>27fa3a50</crc>
-    <manufacturer>bootleg</manufacturer>
-    <year>1981</year>
-    <genre>Maze</genre>
-    <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>2</players>
-    <ctrltype>Joystick</ctrltype>
-    <joyways>4</joyways>
-    <score>3.3</score>
-    <enabled>Yes</enabled>
-  </game>
   <game name="ladyfrog" index="" image="">
     <description>Lady Frog</description>
     <cloneof></cloneof>
@@ -102424,29 +103044,29 @@
   </game>
   <game name="laserbas" index="" image="">
     <description>Laser Base (set 1)</description>
-    <cloneof></cloneof>
+    <cloneof>futflash</cloneof>
     <crc>623f558f</crc>
     <manufacturer>Hoei (Amstar license)</manufacturer>
     <year>1981</year>
-    <genre></genre>
-    <rating></rating>
-    <players>1</players>
-    <ctrltype>Trackball</ctrltype>
-    <buttons>2</buttons>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>1</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
   <game name="laserbasa" index="" image="">
     <description>Laser Base (set 2)</description>
-    <cloneof>laserbas</cloneof>
+    <cloneof>futflash</cloneof>
     <crc>623f558f</crc>
     <manufacturer>Hoei (Amstar license)</manufacturer>
     <year>1981</year>
-    <genre></genre>
-    <rating></rating>
-    <players>1</players>
-    <ctrltype>Trackball</ctrltype>
-    <buttons>2</buttons>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>1</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -102631,7 +103251,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>1</players>
     <ctrltype>Gambling</ctrltype>
-    <buttons>24</buttons>
+    <buttons>10</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -103035,7 +103655,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -103050,7 +103670,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -103065,7 +103685,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -103080,7 +103700,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -105139,9 +105759,9 @@
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="locoloot" index="" image="">
+  <game name="locoloota" index="" image="">
     <description>Loco Loot (0100472V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>locoloot</cloneof>
     <crc>21332a1a</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
@@ -105149,7 +105769,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>3.4</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="locoloot" index="" image="">
+    <description>Loco Loot (0100473V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>0c0c2697</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -105163,7 +105797,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -105399,7 +106033,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -107084,6 +107718,20 @@
     <score>1.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="luckyclo" index="" image="">
+    <description>Lucky Clover (0300109V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>4be1cdef</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="b85luckd" index="" image="">
     <description>Lucky Dice (Dutch) (System 85)</description>
     <cloneof></cloneof>
@@ -108304,7 +108952,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -108319,7 +108967,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -108460,7 +109108,7 @@
     <description>Magic Brush (bootleg of Crush Roller)</description>
     <cloneof>crush</cloneof>
     <crc>77245b66</crc>
-    <manufacturer>bootleg</manufacturer>
+    <manufacturer>bootleg (Olympia)</manufacturer>
     <year>1981</year>
     <genre>Maze</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -109026,7 +109674,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -109089,28 +109737,42 @@
   <game name="magimaska" index="" image="">
     <description>Magic Mask (AHG1548, US)</description>
     <cloneof>magimask</cloneof>
-    <crc>cf4cd569</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>2000</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
   <game name="magimask" index="" image="">
-    <description>Magic Mask (DHG1309, US)</description>
+    <description>Magic Mask (AHG1549, US)</description>
     <cloneof></cloneof>
-    <crc>6829a7bf</crc>
+    <crc>d008deab</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>2000</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
+    <score>2.7</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="magimaskb" index="" image="">
+    <description>Magic Mask (DHG1309, US)</description>
+    <cloneof>magimask</cloneof>
+    <crc>6909acb0</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -109298,17 +109960,31 @@
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="magtcha5" index="" image="">
+  <game name="magtcha5a" index="" image="">
     <description>Magic Touch (0200455V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>magtcha5</cloneof>
     <crc>cfd2a86e</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
+    <score>2.9</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="magtcha5" index="" image="">
+    <description>Magic Touch (0300455V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>5e54ed88</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>2.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -110180,7 +110856,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="mjclinic" index="" image="">
-    <description>Mahjong Clinic (Japan)</description>
+    <description>Mahjong Clinic (Japan, set 1)</description>
     <cloneof></cloneof>
     <crc>174e8ec0</crc>
     <manufacturer>Home Data</manufacturer>
@@ -110193,6 +110869,20 @@
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mjclinica" index="" image="">
+    <description>Mahjong Clinic (Japan, set 2)</description>
+    <cloneof>mjclinic</cloneof>
+    <crc>174e8ec0</crc>
+    <manufacturer>Home Data</manufacturer>
+    <year>1988</year>
+    <genre>Mahjong</genre>
+    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <players>1</players>
+    <ctrltype>Mahjong</ctrltype>
+    <buttons>21</buttons>
+    <score>2.6</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="mjclub" index="" image="">
     <description>Mahjong Club [BET] (Japan)</description>
     <cloneof></cloneof>
@@ -113054,6 +113744,20 @@
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mammothm" index="" image="">
+    <description>Mammoth Money (0100425V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>58171e9b</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="mamonoro" index="" image="">
     <description>Mamoru-kun wa Norowarete Shimatta! (Japan)</description>
     <cloneof></cloneof>
@@ -113503,21 +114207,35 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="marmagicu" index="" image="">
-    <description>Margarita Magic (EHG1559, US)</description>
+  <game name="marmagicua" index="" image="">
+    <description>Margarita Magic (EHG1558, US)</description>
     <cloneof>marmagic</cloneof>
-    <crc>0cd174df</crc>
+    <crc>a2096cb3</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>2000</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
+    <score>2.8</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="marmagicu" index="" image="">
+    <description>Margarita Magic (EHG1559, US)</description>
+    <cloneof>marmagic</cloneof>
+    <crc>bdfdc0e4</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -113578,21 +114296,6 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="mariobl" index="" image="">
-    <description>Mario Bros. (Japan, bootleg)</description>
-    <cloneof>mario</cloneof>
-    <crc>afc9bd41</crc>
-    <manufacturer>bootleg</manufacturer>
-    <year>1983</year>
-    <genre>Platform</genre>
-    <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>2</players>
-    <ctrltype>Joystick</ctrltype>
-    <buttons>1</buttons>
-    <joyways>2</joyways>
-    <score>3.7</score>
-    <enabled>Yes</enabled>
-  </game>
   <game name="pc_mario" index="" image="">
     <description>Mario Bros. (PlayChoice-10)</description>
     <cloneof></cloneof>
@@ -113653,10 +114356,25 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mariobl" index="" image="">
+    <description>Mario Bros. (bootleg on Ambush Hardware)</description>
+    <cloneof>mario</cloneof>
+    <crc>afc9bd41</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>1983</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>2</joyways>
+    <score>3.7</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="mkartagp" index="" image="">
     <description>Mario Kart Arcade GP (Japan, MKA1 Ver.A1)</description>
     <cloneof></cloneof>
-    <crc>274e7b81</crc>
+    <crc>b7159fe3</crc>
     <manufacturer>Namco / Nintendo</manufacturer>
     <year>2005</year>
     <genre></genre>
@@ -113668,7 +114386,7 @@
   <game name="mkartag2" index="" image="">
     <description>Mario Kart Arcade GP 2 (Japan, MK21 Ver.A)</description>
     <cloneof></cloneof>
-    <crc>9ab76062</crc>
+    <crc>0231b10c</crc>
     <manufacturer>Namco / Nintendo</manufacturer>
     <year>2007</year>
     <genre></genre>
@@ -113680,7 +114398,7 @@
   <game name="mkartag2a" index="" image="">
     <description>Mario Kart Arcade GP 2 (Japan, MK21 Ver.A, alt dump)</description>
     <cloneof>mkartag2</cloneof>
-    <crc>8ad6c7ae</crc>
+    <crc>0231b10c</crc>
     <manufacturer>Namco / Nintendo</manufacturer>
     <year>2007</year>
     <genre></genre>
@@ -113802,9 +114520,8 @@
     <genre></genre>
     <rating></rating>
     <players>2</players>
-    <ctrltype>Joystick</ctrltype>
-    <buttons>6</buttons>
-    <joyways>8</joyways>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>3</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -115607,6 +116324,32 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mbs2euro" index="" image="">
+    <description>Mega Bonus Star II (Euro, Millennium Edition)</description>
+    <cloneof></cloneof>
+    <crc>1687b8da</crc>
+    <manufacturer>Auto-Data Graz</manufacturer>
+    <year>2002</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="megacard" index="" image="">
+    <description>Mega Card (Ver.0210, encrypted)</description>
+    <cloneof></cloneof>
+    <crc>3159a548</crc>
+    <manufacturer>Fun World</manufacturer>
+    <year>1993</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>8</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="megadble" index="" image="">
     <description>Mega Double Poker (Ver. 1.63 Espagnol)</description>
     <cloneof></cloneof>
@@ -116884,10 +117627,10 @@
     <enabled>Yes</enabled>
   </game>
   <game name="mslug2t" index="" image="">
-    <description>Metal Slug 2 Turbo (NGM-9410)</description>
+    <description>Metal Slug 2 Turbo (NGM-9410) (hack)</description>
     <cloneof>mslug2</cloneof>
     <crc>7d3e306f</crc>
-    <manufacturer>Hack</manufacturer>
+    <manufacturer>hack (trap15)</manufacturer>
     <year>2015</year>
     <genre>Platform</genre>
     <rating>AAMA - Red (Animated Violence Strong)</rating>
@@ -118043,16 +118786,30 @@
     <enabled>Yes</enabled>
   </game>
   <game name="minemine" index="" image="">
-    <description>Mine, Mine, Mine (VHG0416-99, US)</description>
+    <description>Mine, Mine, Mine (0400115V, NSW/ACT)</description>
     <cloneof></cloneof>
-    <crc>26c01532</crc>
+    <crc>b0607ccf</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1996</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>1.9</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="minemineu" index="" image="">
+    <description>Mine, Mine, Mine (VHG0416-99, US)</description>
+    <cloneof>minemine</cloneof>
+    <crc>6909acb0</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
     <score>1.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -118517,6 +119274,35 @@
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="missw02" index="" image="">
+    <description>Miss World 2002</description>
+    <cloneof></cloneof>
+    <crc>864167c2</crc>
+    <manufacturer>Daigom</manufacturer>
+    <year>2002</year>
+    <genre>Puzzle</genre>
+    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>4</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="missilea" index="" image="">
+    <description>Missile Attack</description>
+    <cloneof>missile</cloneof>
+    <crc>86a22140</crc>
+    <manufacturer>bootleg (Ugames)</manufacturer>
+    <year>1981</year>
+    <genre>Shooter</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Trackball</ctrltype>
+    <buttons>3</buttons>
+    <score>2.6</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="mcombats" index="" image="">
     <description>Missile Combat (Sidam bootleg)</description>
     <cloneof>missile</cloneof>
@@ -119138,8 +119924,23 @@
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="momokoe" index="" image="">
+    <description>Momoko 120% (English text)</description>
+    <cloneof>momoko</cloneof>
+    <crc>427b0e5c</crc>
+    <manufacturer>Jaleco</manufacturer>
+    <year>1986</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>4</joyways>
+    <score>4.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="momoko" index="" image="">
-    <description>Momoko 120%</description>
+    <description>Momoko 120% (Japanese text)</description>
     <cloneof></cloneof>
     <crc>427b0e5c</crc>
     <manufacturer>Jaleco</manufacturer>
@@ -119153,6 +119954,21 @@
     <score>4.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="momokob" index="" image="">
+    <description>Momoko 120% (bootleg)</description>
+    <cloneof>momoko</cloneof>
+    <crc>427b0e5c</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>1986</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>4</joyways>
+    <score>4.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="monacogp" index="" image="">
     <description>Monaco GP (Set 1) [TTL]</description>
     <cloneof></cloneof>
@@ -119638,6 +120454,20 @@
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="monmousea" index="" image="">
+    <description>Money Mouse (0300469V, NSW/ACT)</description>
+    <cloneof>monmouse</cloneof>
+    <crc>2be9bce0</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="monmouse" index="" image="">
     <description>Money Mouse (0400469V, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -119648,7 +120478,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -120235,7 +121065,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -122855,7 +123685,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="moonbase" index="" image="">
-    <description>Moon Base (set 1)</description>
+    <description>Moon Base Zeta (set 1)</description>
     <cloneof>invadpt2</cloneof>
     <crc>aac24f34</crc>
     <manufacturer>Taito / Nichibutsu</manufacturer>
@@ -122870,7 +123700,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="moonbasea" index="" image="">
-    <description>Moon Base (set 2)</description>
+    <description>Moon Base Zeta (set 2)</description>
     <cloneof>invadpt2</cloneof>
     <crc>aac24f34</crc>
     <manufacturer>Taito / Nichibutsu</manufacturer>
@@ -124372,6 +125202,20 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mountmona" index="" image="">
+    <description>Mountain Money (0100289V, NSW/ACT)</description>
+    <cloneof>mountmon</cloneof>
+    <crc>565b76ff</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="mountmon" index="" image="">
     <description>Mountain Money (0100294V, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -124382,7 +125226,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -124430,6 +125274,21 @@
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mtrap2" index="" image="">
+    <description>Mouse Trap (version 2)</description>
+    <cloneof>mtrap</cloneof>
+    <crc>c6e4d339</crc>
+    <manufacturer>Exidy</manufacturer>
+    <year>1981</year>
+    <genre>Maze</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>4</joyways>
+    <score>3.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="mtrap3" index="" image="">
     <description>Mouse Trap (version 3)</description>
     <cloneof>mtrap</cloneof>
@@ -125816,6 +126675,21 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mltiwars" index="" image="">
+    <description>Multi Wars (bootleg of UniWar S)</description>
+    <cloneof>uniwars</cloneof>
+    <crc>6a0c7d87</crc>
+    <manufacturer>bootleg (Gayton Games)</manufacturer>
+    <year>1980</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>2</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="multiwin" index="" image="">
     <description>Multi Win (Ver.0167, encrypted)</description>
     <cloneof></cloneof>
@@ -125840,7 +126714,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>22</buttons>
     <score>1.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -125859,10 +126733,22 @@
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="ms3" index="" image="">
+    <description>Multistar 3</description>
+    <cloneof></cloneof>
+    <crc>acbbc6d9</crc>
+    <manufacturer>IGT</manufacturer>
+    <year>1994</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="ms72c" index="" image="">
     <description>Multistar 7 2c</description>
     <cloneof></cloneof>
-    <crc>69656637</crc>
+    <crc>b5e42dbc</crc>
     <manufacturer>IGT</manufacturer>
     <year>1994</year>
     <genre></genre>
@@ -126577,7 +127463,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -126896,7 +127782,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
-    <buttons>3</buttons>
+    <buttons>4</buttons>
     <joyways>8</joyways>
     <score>4.4</score>
     <enabled>Yes</enabled>
@@ -126911,7 +127797,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
-    <buttons>3</buttons>
+    <buttons>4</buttons>
     <joyways>8</joyways>
     <score>4.4</score>
     <enabled>Yes</enabled>
@@ -126993,7 +127879,7 @@
   </game>
   <game name="nbamht1" index="" image="">
     <description>NBA Maximum Hangtime (rev 1.0 11/08/96)</description>
-    <cloneof>nbahangt</cloneof>
+    <cloneof>nbamht</cloneof>
     <crc>8575aeb2</crc>
     <manufacturer>Midway</manufacturer>
     <year>1996</year>
@@ -127008,7 +127894,7 @@
   </game>
   <game name="nbamht" index="" image="">
     <description>NBA Maximum Hangtime (rev 1.03 06/09/97)</description>
-    <cloneof>nbahangt</cloneof>
+    <cloneof></cloneof>
     <crc>8575aeb2</crc>
     <manufacturer>Midway</manufacturer>
     <year>1996</year>
@@ -127021,8 +127907,23 @@
     <score>4.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="nbapbpa" index="" image="">
+    <description>NBA Play By Play (ver AAB)</description>
+    <cloneof>nbapbp</cloneof>
+    <crc>3cff1b1d</crc>
+    <manufacturer>Konami</manufacturer>
+    <year>1998</year>
+    <genre>Sports/Basketball</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>4.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="nbapbp" index="" image="">
-    <description>NBA Play By Play</description>
+    <description>NBA Play By Play (ver JAA)</description>
     <cloneof></cloneof>
     <crc>3cff1b1d</crc>
     <manufacturer>Konami</manufacturer>
@@ -128512,10 +129413,10 @@
     <enabled>Yes</enabled>
   </game>
   <game name="janputer" index="" image="">
-    <description>New Double Bet Mahjong (bootleg of Janputer)</description>
+    <description>New Double Bet Mahjong (bootleg of Royal Mahjong) [BET]</description>
     <cloneof></cloneof>
     <crc>d3007282</crc>
-    <manufacturer>bootleg (Public Software Ltd. / Mes)</manufacturer>
+    <manufacturer>bootleg (Paradise Denshi Ltd. / Mes)</manufacturer>
     <year>1981</year>
     <genre>Mahjong</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -131381,6 +132282,20 @@
   </game>
   <game name="omega" index="" image="">
     <description>Omega</description>
+    <cloneof></cloneof>
+    <crc>28b5ee4c</crc>
+    <manufacturer>Nihon System</manufacturer>
+    <year>1986</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Dial</ctrltype>
+    <buttons>2</buttons>
+    <score>2.0</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="omegab" index="" image="">
+    <description>Omega (bootleg?)</description>
     <cloneof>theend</cloneof>
     <crc>6a0c7d87</crc>
     <manufacturer>bootleg</manufacturer>
@@ -131391,7 +132306,7 @@
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
     <joyways>2</joyways>
-    <score>2.0</score>
+    <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
   <game name="omegaf" index="" image="">
@@ -132024,6 +132939,20 @@
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="orchidmsa" index="" image="">
+    <description>Orchid Mist (0100849V, NSW/ACT)</description>
+    <cloneof>orchidms</cloneof>
+    <crc>4b5baf9d</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="orchidms" index="" image="">
     <description>Orchid Mist (0200849V, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -132034,7 +132963,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -132326,6 +133255,20 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="oscara5a" index="" image="">
+    <description>Oscar (0100348V, NSW/ACT)</description>
+    <cloneof>oscara5</cloneof>
+    <crc>fd1c5c7b</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="oscara5" index="" image="">
     <description>Oscar (0200348V, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -132336,7 +133279,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -132476,7 +133419,7 @@
   <game name="ogonsiro" index="" image="">
     <description>Ougon no Shiro (Japan)</description>
     <cloneof>gladiatr</cloneof>
-    <crc>e325808e</crc>
+    <crc>3c5ca4c6</crc>
     <manufacturer>Allumer / Taito Corporation</manufacturer>
     <year>1986</year>
     <genre>Beat-'Em-Up</genre>
@@ -132732,6 +133675,21 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="outr2sto" index="" image="">
+    <description>OutRun 2 Special Tours (GDX-0014)</description>
+    <cloneof>outr2st</cloneof>
+    <crc>f94cf26f</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>2004</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="outr2stj" index="" image="">
     <description>OutRun 2 Special Tours (Japan) (Rev A) (GDX-0011A)</description>
     <cloneof>outr2st</cloneof>
@@ -134915,6 +135873,20 @@
     <score>1.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="pantmaga" index="" image="">
+    <description>Panther Magic (0100716V, NSW/ACT)</description>
+    <cloneof>pantmag</cloneof>
+    <crc>6adfd0ab</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>22</buttons>
+    <score>1.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="pantmag" index="" image="">
     <description>Panther Magic (0101046V, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -134925,7 +135897,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -135376,14 +136348,14 @@
   <game name="partygrs" index="" image="">
     <description>Party Gras (AHG1567, US)</description>
     <cloneof></cloneof>
-    <crc>00d1395c</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>2001</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -135395,9 +136367,9 @@
     <year>2001</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -135870,7 +136842,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -136160,6 +137132,35 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="penbrosk" index="" image="">
+    <description>Penguin Brothers (Japan, bootleg)</description>
+    <cloneof>penbros</cloneof>
+    <crc>de4e65e2</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>2000</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>3.6</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="pengpayc" index="" image="">
+    <description>Penguin Pays (0100113V, NSW/ACT)</description>
+    <cloneof>pengpay</cloneof>
+    <crc>a1865467</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="pengpaya" index="" image="">
     <description>Penguin Pays (0200357V, NSW/ACT)</description>
     <cloneof>pengpay</cloneof>
@@ -136170,7 +137171,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -136184,7 +137185,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -136198,21 +137199,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
   <game name="pengpayu" index="" image="">
     <description>Penguin Pays (BHI0417-03, US)</description>
     <cloneof>pengpay</cloneof>
-    <crc>d959a048</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -136228,6 +137229,62 @@
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="pengpuck" index="" image="">
+    <description>Penguin Pays - Penguin Pucks (EHG1257, US)</description>
+    <cloneof>pengpay</cloneof>
+    <crc>b6cb5809</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2001</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>25</buttons>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="penpir" index="" image="">
+    <description>Penguin Pirate (0100674V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>acdbbbe6</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="penpira" index="" image="">
+    <description>Penguin Pirate (0200578V, NSW/ACT)</description>
+    <cloneof>penpir</cloneof>
+    <crc>7ea30a52</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="penpir2" index="" image="">
+    <description>Penguin Pirate II (0100869V, Victoria)</description>
+    <cloneof></cloneof>
+    <crc>e1dbfd58</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="pkunwarj" index="" image="">
     <description>Penguin-Kun Wars (Japan)</description>
     <cloneof>pkunwar</cloneof>
@@ -136507,9 +137564,9 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="petshop" index="" image="">
+  <game name="petshopa" index="" image="">
     <description>Pet Shop (0100679V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>petshop</cloneof>
     <crc>2cd12986</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1998</year>
@@ -136517,7 +137574,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>3.8</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="petshop" index="" image="">
+    <description>Pet Shop (0100731V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>6e74cd57</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -136641,6 +137712,20 @@
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="phantpay" index="" image="">
+    <description>Phantom Pays (0500005V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>d43a092a</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="phantomp" index="" image="">
     <description>Phantom Pays (4VXFC5431, New Zealand)</description>
     <cloneof></cloneof>
@@ -137084,6 +138169,21 @@
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="phoenixi" index="" image="">
+    <description>Phoenix (IDI bootleg)</description>
+    <cloneof>phoenix</cloneof>
+    <crc>c68a49bc</crc>
+    <manufacturer>bootleg (IDI)</manufacturer>
+    <year>1981</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>2</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="phoenixc" index="" image="">
     <description>Phoenix (Irecsa / G.G.I Corp, set 1)</description>
     <cloneof>phoenix</cloneof>
@@ -137642,7 +138742,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -137890,7 +138990,7 @@
     <description>Pig Out: Dine Like a Swine! (set 1)</description>
     <cloneof></cloneof>
     <crc>9646fa72</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1990</year>
     <genre>Platform</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -137905,7 +139005,7 @@
     <description>Pig Out: Dine Like a Swine! (set 2)</description>
     <cloneof>pigout</cloneof>
     <crc>9646fa72</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1990</year>
     <genre>Platform</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -142317,7 +143417,7 @@
   <game name="pepp0057b" index="" image="">
     <description>Player's Edge Plus (PP0057) Deuces Wild Poker (set 3, El Cortez)</description>
     <cloneof>pepp0054</cloneof>
-    <crc>ab8ec1e4</crc>
+    <crc>00439b0d</crc>
     <manufacturer>IGT - International Game Technology</manufacturer>
     <year>1987</year>
     <genre>Casino</genre>
@@ -143605,7 +144705,7 @@
   <game name="pepp0295" index="" image="">
     <description>Player's Edge Plus (PP0295) Super Deuces Wild Poker</description>
     <cloneof></cloneof>
-    <crc>6fe619c4</crc>
+    <crc>294b7b10</crc>
     <manufacturer>IGT - International Game Technology</manufacturer>
     <year>1987</year>
     <genre>Casino</genre>
@@ -148124,6 +149224,20 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="pexmp011" index="" image="">
+    <description>Player's Edge Plus (XMP00011) 5-in-1 Wingboard (CG2298)</description>
+    <cloneof></cloneof>
+    <crc>77856036</crc>
+    <manufacturer>IGT - International Game Technology</manufacturer>
+    <year>1995</year>
+    <genre>Casino</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>7</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="pexmp013" index="" image="">
     <description>Player's Edge Plus (XMP00013) 5-in-1 Wingboard (CG2346) - Spanish</description>
     <cloneof></cloneof>
@@ -148531,7 +149645,7 @@
     <description>Pnickies (Japan 940608)</description>
     <cloneof></cloneof>
     <crc>0fbd9270</crc>
-    <manufacturer>Compile (Capcom license)</manufacturer>
+    <manufacturer>Capcom</manufacturer>
     <year>1994</year>
     <genre>Puzzle</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -149781,7 +150895,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="polyplay" index="" image="">
-    <description>Poly-Play</description>
+    <description>Poly-Play (ZRE)</description>
     <cloneof></cloneof>
     <crc>5242dd6b</crc>
     <manufacturer>VEB Polytechnik Karl-Marx-Stadt</manufacturer>
@@ -149795,6 +150909,36 @@
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="polyplay2c" index="" image="">
+    <description>Poly-Play (ZRE-PP - Czech)</description>
+    <cloneof>polyplay2</cloneof>
+    <crc>4f028af9</crc>
+    <manufacturer>VEB Polytechnik Karl-Marx-Stadt</manufacturer>
+    <year>1989</year>
+    <genre>Compilation</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="polyplay2" index="" image="">
+    <description>Poly-Play (ZRE-PP)</description>
+    <cloneof></cloneof>
+    <crc>4f028af9</crc>
+    <manufacturer>VEB Polytechnik Karl-Marx-Stadt</manufacturer>
+    <year>1989</year>
+    <genre>Compilation</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="plygonet" index="" image="">
     <description>Polygonet Commanders (ver UAA)</description>
     <cloneof></cloneof>
@@ -149856,7 +151000,7 @@
     <manufacturer>Atari</manufacturer>
     <year>1972</year>
     <genre>Ball &amp; Paddle</genre>
-    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Paddle</ctrltype>
     <score>3.2</score>
@@ -149882,7 +151026,7 @@
     <manufacturer>Atari</manufacturer>
     <year>1973</year>
     <genre>Ball &amp; Paddle</genre>
-    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>4</players>
     <ctrltype>Paddle</ctrltype>
     <score>3.2</score>
@@ -150708,11 +151852,14 @@
     <description>Popper</description>
     <cloneof></cloneof>
     <crc>384de5c1</crc>
-    <manufacturer>Omori Electric Co., Ltd.</manufacturer>
+    <manufacturer>Omori</manufacturer>
     <year>1983</year>
     <genre>Platform</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>0</players>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -150832,6 +151979,18 @@
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="potgoldu580" index="" image="">
+    <description>Pot O' Gold (U.S. Games, v580F)</description>
+    <cloneof>potgoldu</cloneof>
+    <crc>cca108a4</crc>
+    <manufacturer>U.S. Games Inc.</manufacturer>
+    <year>200?</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score>2.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sc4potsh" index="" image="">
     <description>Pot Shot (Qps) (Scorpion 4) (set 1)</description>
     <cloneof></cloneof>
@@ -151481,6 +152640,20 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="pwrflip" index="" image="">
+    <description>Power Flipper Pinball Shooting v1.33</description>
+    <cloneof></cloneof>
+    <crc>092b2c0f</crc>
+    <manufacturer>Excellent System</manufacturer>
+    <year>1994</year>
+    <genre>Pinball</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>8</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="powerins" index="" image="">
     <description>Power Instinct (USA)</description>
     <cloneof></cloneof>
@@ -152535,9 +153708,9 @@
     <enabled>Yes</enabled>
   </game>
   <game name="prc2ksu" index="" image="">
-    <description>Print Club 2 2000 Summer</description>
+    <description>Print Club 2 2000 Summer (J 000509 V1.000)</description>
     <cloneof></cloneof>
-    <crc>91b261b1</crc>
+    <crc>ee7ffdc5</crc>
     <manufacturer>Atlus</manufacturer>
     <year>2000</year>
     <genre></genre>
@@ -152874,7 +154047,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -154059,7 +155232,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -154074,7 +155247,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -154089,7 +155262,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -154104,7 +155277,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -155244,6 +156417,21 @@
     <score>2.7</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="puzznicu" index="" image="">
+    <description>Puzznic (US)</description>
+    <cloneof>puzznic</cloneof>
+    <crc>3c115f8b</crc>
+    <manufacturer>Taito America Corporation</manufacturer>
+    <year>1989</year>
+    <genre>Puzzle</genre>
+    <rating>AAMA - Red (Sexual Content Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>2.7</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="puzznic" index="" image="">
     <description>Puzznic (World)</description>
     <cloneof></cloneof>
@@ -155444,6 +156632,20 @@
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="qtbird" index="" image="">
+    <description>Q.T. Bird (0500009V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>bb8344a9</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1994</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="qb3" index="" image="">
     <description>QB-3 (prototype)</description>
     <cloneof></cloneof>
@@ -155673,7 +156875,7 @@
     <description>Quarterback (set 1)</description>
     <cloneof></cloneof>
     <crc>99d8c2ef</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1987</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -155688,7 +156890,7 @@
     <description>Quarterback (set 2)</description>
     <cloneof>quarterb</cloneof>
     <crc>99d8c2ef</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1987</year>
     <genre>Sports/Football</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -156094,9 +157296,9 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="qnile" index="" image="">
+  <game name="qnileb" index="" image="">
     <description>Queen of the Nile (0100439V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>qnile</cloneof>
     <crc>bdcec4eb</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
@@ -156104,11 +157306,39 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="qnileb" index="" image="">
+  <game name="qniled" index="" image="">
+    <description>Queen of the Nile (0101139V, NSW/ACT)</description>
+    <cloneof>qnile</cloneof>
+    <crc>160fbbb5</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="qnilebr" index="" image="">
+    <description>Queen of the Nile (0101707V, Brazil)</description>
+    <cloneof>qnile</cloneof>
+    <crc>1b5da8ca</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2002</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="qnilea" index="" image="">
     <description>Queen of the Nile (0200439V, NSW/ACT)</description>
     <cloneof>qnile</cloneof>
     <crc>2a0f7feb</crc>
@@ -156118,13 +157348,13 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="qnilec" index="" image="">
+  <game name="qnile" index="" image="">
     <description>Queen of the Nile (0300439V, NSW/ACT)</description>
-    <cloneof>qnile</cloneof>
+    <cloneof></cloneof>
     <crc>eec01bb4</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
@@ -156132,11 +157362,11 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="qnilea" index="" image="">
+  <game name="qnilec" index="" image="">
     <description>Queen of the Nile (0300440V, NSW/ACT)</description>
     <cloneof>qnile</cloneof>
     <crc>52bd3694</crc>
@@ -156146,7 +157376,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="qnilev" index="" image="">
+    <description>Queen of the Nile (04J00784, Venezuela)</description>
+    <cloneof>qnile</cloneof>
+    <crc>621adc77</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -156165,28 +157409,56 @@
   <game name="qnileu" index="" image="">
     <description>Queen of the Nile (GHG4091-02, US)</description>
     <cloneof>qnile</cloneof>
-    <crc>7871a846</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="qnilecea" index="" image="">
+    <description>Queen of the Nile - Cash Express (AHG1525, US)</description>
+    <cloneof>qnile</cloneof>
+    <crc>520452d4</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2001</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="qnilece" index="" image="">
+    <description>Queen of the Nile - Cash Express (AHG1609, US)</description>
+    <cloneof>qnile</cloneof>
+    <crc>fe7817f3</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2001</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
   <game name="qnilemax" index="" image="">
     <description>Queen of the Nile - Maximillions (0401072V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>qnile</cloneof>
     <crc>4fbccf72</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1999</year>
     <genre></genre>
     <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <players>2</players>
+    <ctrltype>Lightgun</ctrltype>
+    <buttons>1</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -156250,7 +157522,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -157249,7 +158521,7 @@
   <game name="quizard_10" index="" image="">
     <description>Quizard (v1.0)</description>
     <cloneof>quizard</cloneof>
-    <crc>279683ca</crc>
+    <crc>95f45b6b</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1995</year>
     <genre>Quiz</genre>
@@ -157263,7 +158535,7 @@
   <game name="quizard_12" index="" image="">
     <description>Quizard (v1.2)</description>
     <cloneof>quizard</cloneof>
-    <crc>279683ca</crc>
+    <crc>95f45b6b</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1995</year>
     <genre>Quiz</genre>
@@ -157277,7 +158549,7 @@
   <game name="quizard_17" index="" image="">
     <description>Quizard (v1.7)</description>
     <cloneof>quizard</cloneof>
-    <crc>279683ca</crc>
+    <crc>95f45b6b</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1995</year>
     <genre>Quiz</genre>
@@ -157291,7 +158563,7 @@
   <game name="quizard" index="" image="">
     <description>Quizard (v1.8)</description>
     <cloneof></cloneof>
-    <crc>279683ca</crc>
+    <crc>95f45b6b</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1995</year>
     <genre>Quiz</genre>
@@ -157361,7 +158633,7 @@
   <game name="quizard4_40" index="" image="">
     <description>Quizard 4 Rainbow (v4.0)</description>
     <cloneof>quizard4</cloneof>
-    <crc>279683ca</crc>
+    <crc>77be0b40</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1997</year>
     <genre></genre>
@@ -157375,7 +158647,7 @@
   <game name="quizard4_41" index="" image="">
     <description>Quizard 4 Rainbow (v4.1)</description>
     <cloneof>quizard4</cloneof>
-    <crc>279683ca</crc>
+    <crc>77be0b40</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1998</year>
     <genre></genre>
@@ -157389,7 +158661,7 @@
   <game name="quizard4" index="" image="">
     <description>Quizard 4 Rainbow (v4.2)</description>
     <cloneof></cloneof>
-    <crc>279683ca</crc>
+    <crc>77be0b40</crc>
     <manufacturer>TAB Austria</manufacturer>
     <year>1998</year>
     <genre></genre>
@@ -158459,8 +159731,23 @@
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="radradj" index="" image="">
+    <description>Radical Radial (Japan)</description>
+    <cloneof>radrad</cloneof>
+    <crc>a356803a</crc>
+    <manufacturer>Logitec Corp.</manufacturer>
+    <year>1983</year>
+    <genre>Shooter</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="radrad" index="" image="">
-    <description>Radical Radial</description>
+    <description>Radical Radial (US)</description>
     <cloneof></cloneof>
     <crc>a356803a</crc>
     <manufacturer>Nichibutsu USA</manufacturer>
@@ -158636,6 +159923,21 @@
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="raidenkb" index="" image="">
+    <description>Raiden (Korea, bootleg)</description>
+    <cloneof>raiden</cloneof>
+    <crc>8f927822</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>1990</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>4.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="raident" index="" image="">
     <description>Raiden (Taiwan)</description>
     <cloneof>raiden</cloneof>
@@ -158730,7 +160032,7 @@
     <description>Raiden DX (China)</description>
     <cloneof>raidendx</cloneof>
     <crc>8cf0d17e</crc>
-    <manufacturer>Seibu Kaihatsu (Ideal International Development Corp license) </manufacturer>
+    <manufacturer>Seibu Kaihatsu (Ideal International Development Corp license)</manufacturer>
     <year>1994</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -159371,6 +160673,21 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="raiden2g" index="" image="">
+    <description>Raiden II (Germany)</description>
+    <cloneof>raiden2</cloneof>
+    <crc>d1a039af</crc>
+    <manufacturer>Seibu Kaihatsu (Tuning license)</manufacturer>
+    <year>1993</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>3.9</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="raiden2nl" index="" image="">
     <description>Raiden II (Holland)</description>
     <cloneof>raiden2</cloneof>
@@ -159476,7 +160793,7 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="raiden2g" index="" image="">
+  <game name="raiden2eg" index="" image="">
     <description>Raiden II (easy version, Germany)</description>
     <cloneof>raiden2</cloneof>
     <crc>d1a039af</crc>
@@ -159852,7 +161169,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -161103,6 +162420,21 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="rbff1k" index="" image="">
+    <description>Real Bout Fatal Fury / Real Bout Garou Densetsu (Korean release)</description>
+    <cloneof>rbff1</cloneof>
+    <crc>4e6beb6c</crc>
+    <manufacturer>SNK</manufacturer>
+    <year>1995</year>
+    <genre>Fighter</genre>
+    <rating>AAMA - Red (Animated Violence Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>3.9</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="rbff1" index="" image="">
     <description>Real Bout Fatal Fury / Real Bout Garou Densetsu (NGM-095 ~ NGH-095)</description>
     <cloneof></cloneof>
@@ -161666,6 +162998,21 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="redhawkg" index="" image="">
+    <description>Red Hawk (Greece)</description>
+    <cloneof>stagger1</cloneof>
+    <crc>e911ce33</crc>
+    <manufacturer>Afega</manufacturer>
+    <year>1997</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>2.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="redhawki" index="" image="">
     <description>Red Hawk (Italy)</description>
     <cloneof>stagger1</cloneof>
@@ -162518,6 +163865,20 @@
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="reelpwr" index="" image="">
+    <description>Reel Power (0100400V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>e6033756</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="ad5rroulb" index="" image="">
     <description>Reel Roulette (MAZNRERO) (Mazooma) (Adder 5)</description>
     <cloneof>ad5rroul</cloneof>
@@ -162646,7 +164007,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -162762,7 +164123,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>4</joyways>
+    <joyways>8</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -163283,7 +164644,7 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="retrsama" index="" image="">
+  <game name="retrsamb" index="" image="">
     <description>Return of the Samurai (0200506V, NSW/ACT)</description>
     <cloneof>retrsam</cloneof>
     <crc>e662404b</crc>
@@ -163293,11 +164654,11 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="retrsamb" index="" image="">
+  <game name="retrsama" index="" image="">
     <description>Return of the Samurai (0200549V, NSW/ACT)</description>
     <cloneof>retrsam</cloneof>
     <crc>99f61822</crc>
@@ -163307,7 +164668,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -163321,7 +164682,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -163348,8 +164709,8 @@
     <genre></genre>
     <rating></rating>
     <players>1</players>
-    <ctrltype>Buttons</ctrltype>
-    <buttons>6</buttons>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>9</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -165316,6 +166677,21 @@
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="roboarma" index="" image="">
+    <description>Robo Army (NGM-032 ~ NGH-032)</description>
+    <cloneof>roboarmy</cloneof>
+    <crc>462571de</crc>
+    <manufacturer>SNK</manufacturer>
+    <year>1991</year>
+    <genre>Beat-'Em-Up</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="robowres" index="" image="">
     <description>Robo Wres 2001</description>
     <cloneof></cloneof>
@@ -167375,6 +168751,21 @@
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="rascot2" index="" image="">
+    <description>Royal Ascot II</description>
+    <cloneof></cloneof>
+    <crc>168cc361</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="royalcrd" index="" image="">
     <description>Royal Card (Austrian, set 1)</description>
     <cloneof></cloneof>
@@ -167771,7 +169162,7 @@
     <year>1996</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -168506,10 +169897,24 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="rushrst" index="" image="">
+    <description>Rushin Rooster (0100534V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>dfe02424</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="rushhero" index="" image="">
     <description>Rushing Heroes (ver UAB)</description>
     <cloneof></cloneof>
-    <crc>992c4751</crc>
+    <crc>458ecee1</crc>
     <manufacturer>Konami</manufacturer>
     <year>1996</year>
     <genre>Sports/Football</genre>
@@ -169815,6 +171220,21 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="samesamenh" index="" image="">
+    <description>Same! Same! Same! (1P set, NEW VER! hack)</description>
+    <cloneof>fireshrk</cloneof>
+    <crc>a1e17492</crc>
+    <manufacturer>hack (trap15)</manufacturer>
+    <year>2015</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>4.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="samesame2" index="" image="">
     <description>Same! Same! Same! (2P set)</description>
     <cloneof>fireshrk</cloneof>
@@ -170143,7 +171563,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="sfrush" index="" image="">
-    <description>San Francisco Rush</description>
+    <description>San Francisco Rush (boot rom L 1.0)</description>
     <cloneof></cloneof>
     <crc>dfb0a54c</crc>
     <manufacturer>Atari Games</manufacturer>
@@ -170156,6 +171576,20 @@
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sfrusha" index="" image="">
+    <description>San Francisco Rush (boot rom L 1.06A)</description>
+    <cloneof>sfrush</cloneof>
+    <crc>dfb0a54c</crc>
+    <manufacturer>Atari Games</manufacturer>
+    <year>1996</year>
+    <genre>Driving</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Pedal</ctrltype>
+    <buttons>13</buttons>
+    <score>3.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sf2049" index="" image="">
     <description>San Francisco Rush 2049</description>
     <cloneof></cloneof>
@@ -170201,8 +171635,36 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sfrushrkw" index="" image="">
+    <description>San Francisco Rush: The Rock (Wavenet, boot rom L 1.38, GUTS Aug 19 1997 / MAIN Aug 19 1997)</description>
+    <cloneof>sfrushrk</cloneof>
+    <crc>e6b684d3</crc>
+    <manufacturer>Atari Games</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Pedal</ctrltype>
+    <buttons>13</buttons>
+    <score>3.0</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="sfrushrkwo" index="" image="">
+    <description>San Francisco Rush: The Rock (Wavenet, boot rom L 1.38, GUTS Aug 6 1997 / MAIN Aug 5 1997)</description>
+    <cloneof>sfrushrk</cloneof>
+    <crc>e6b684d3</crc>
+    <manufacturer>Atari Games</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Pedal</ctrltype>
+    <buttons>13</buttons>
+    <score>3.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sfrushrk" index="" image="">
-    <description>San Francisco Rush: The Rock</description>
+    <description>San Francisco Rush: The Rock (boot rom L 1.0, GUTS Oct 6 1997 / MAIN Oct 16 1997)</description>
     <cloneof></cloneof>
     <crc>e6b684d3</crc>
     <manufacturer>Atari Games</manufacturer>
@@ -170498,7 +171960,22 @@
     <enabled>Yes</enabled>
   </game>
   <game name="samsho2k" index="" image="">
-    <description>Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II)</description>
+    <description>Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 1)</description>
+    <cloneof>samsho2</cloneof>
+    <crc>1ffc6dfa</crc>
+    <manufacturer>SNK</manufacturer>
+    <year>1994</year>
+    <genre>Fighter</genre>
+    <rating>AAMA - Red (Animated Violence Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>4.6</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="samsho2ka" index="" image="">
+    <description>Saulabi Spirits / Jin Saulabi Tu Hon (Korean release of Samurai Shodown II, set 2)</description>
     <cloneof>samsho2</cloneof>
     <crc>1ffc6dfa</crc>
     <manufacturer>SNK</manufacturer>
@@ -170890,10 +172367,10 @@
     <enabled>Yes</enabled>
   </game>
   <game name="scramblebf" index="" image="">
-    <description>Scramble (Karateko, French bootleg)</description>
+    <description>Scramble (Karateco, French bootleg)</description>
     <cloneof>scramble</cloneof>
     <crc>4e3caeab</crc>
-    <manufacturer>bootleg (Karateko)</manufacturer>
+    <manufacturer>bootleg (Karateco)</manufacturer>
     <year>1981</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -171615,7 +173092,7 @@
   <game name="secretab" index="" image="">
     <description>Secret Agent (bootleg)</description>
     <cloneof>secretag</cloneof>
-    <crc>439eb5a9</crc>
+    <crc>f61972c8</crc>
     <manufacturer>bootleg</manufacturer>
     <year>1989</year>
     <genre>Platform</genre>
@@ -171993,7 +173470,21 @@
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="srallyca" index="" image="">
+  <game name="srallycdxa" index="" image="">
+    <description>Sega Rally Championship - DX</description>
+    <cloneof>srallyc</cloneof>
+    <crc>a25fef5b</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Pedal</ctrltype>
+    <buttons>6</buttons>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="srallycdx" index="" image="">
     <description>Sega Rally Championship - DX (Revision A)</description>
     <cloneof>srallyc</cloneof>
     <crc>a25fef5b</crc>
@@ -172008,7 +173499,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="srallycb" index="" image="">
-    <description>Sega Rally Championship - TWIN (Revision B)</description>
+    <description>Sega Rally Championship - TWIN/DX (Revision B)</description>
     <cloneof>srallyc</cloneof>
     <crc>a25fef5b</crc>
     <manufacturer>Sega</manufacturer>
@@ -172022,7 +173513,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="srallyc" index="" image="">
-    <description>Sega Rally Championship - TWIN (Revision C)</description>
+    <description>Sega Rally Championship - TWIN/DX (Revision C)</description>
     <cloneof></cloneof>
     <crc>a25fef5b</crc>
     <manufacturer>Sega</manufacturer>
@@ -172050,6 +173541,21 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sonicfgt" index="" image="">
+    <description>Sega Sonic Cosmo Fighter</description>
+    <cloneof></cloneof>
+    <crc>e87e8433</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1993</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sstrkfgt" index="" image="">
     <description>Sega Strike Fighter (Rev A)</description>
     <cloneof></cloneof>
@@ -173532,6 +175038,21 @@
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="shangha3up" index="" image="">
+    <description>Shanghai III (US, prototype)</description>
+    <cloneof>shangha3</cloneof>
+    <crc>f0cdc86a</crc>
+    <manufacturer>Sunsoft</manufacturer>
+    <year>1993</year>
+    <genre>Puzzle</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="shangha3" index="" image="">
     <description>Shanghai III (World)</description>
     <cloneof></cloneof>
@@ -174146,6 +175667,20 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="shinygld" index="" image="">
+    <description>Shiny Golds</description>
+    <cloneof></cloneof>
+    <crc>113ccf81</crc>
+    <manufacturer>Playmark</manufacturer>
+    <year>1996</year>
+    <genre>Casino</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>4</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="shippumd" index="" image="">
     <description>Shippu Mahou Daisakusen (Japan)</description>
     <cloneof>kingdmgp</cloneof>
@@ -175210,7 +176745,7 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="sidebs2j" index="" image="">
+  <game name="sidebs2ja" index="" image="">
     <description>Side by Side 2 Evoluzione (Ver 2.4 J)</description>
     <cloneof>sidebs2</cloneof>
     <crc>25373c5f</crc>
@@ -175225,6 +176760,21 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sidebs2j" index="" image="">
+    <description>Side by Side 2 Evoluzione RR (Ver 3.1 J)</description>
+    <cloneof>sidebs2</cloneof>
+    <crc>25373c5f</crc>
+    <manufacturer>Taito</manufacturer>
+    <year>1997</year>
+    <genre>Driving</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Pedal</ctrltype>
+    <buttons>3</buttons>
+    <joyways>vertical2</joyways>
+    <score>4.0</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sidewndr" index="" image="">
     <description>Sidewinder</description>
     <cloneof></cloneof>
@@ -175557,6 +177107,35 @@
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="slvrwolf" index="" image="">
+    <description>Silver Wolf (0100673V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>122816dd</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>22</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="simpsonjr" index="" image="">
+    <description>Simpson Junior (bootleg of J. J. Squawkers)</description>
+    <cloneof>jjsquawk</cloneof>
+    <crc>9df1e478</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>2003</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>4.1</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="simpbowl" index="" image="">
     <description>Simpsons Bowling (GQ829 UAA)</description>
     <cloneof></cloneof>
@@ -176027,6 +177606,21 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="mwskinst" index="" image="">
+    <description>Skins Game Tournament Edition</description>
+    <cloneof>mwskins</cloneof>
+    <crc>0fe87720</crc>
+    <manufacturer>Midway</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="skullxbo1" index="" image="">
     <description>Skull &amp; Crossbones (rev 1)</description>
     <cloneof>skullxbo</cloneof>
@@ -176102,6 +177696,21 @@
     <score>1.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="skullfnga" index="" image="">
+    <description>Skull Fang (Asia)</description>
+    <cloneof>skullfng</cloneof>
+    <crc>240d882e</crc>
+    <manufacturer>Data East Corporation</manufacturer>
+    <year>1996</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>4</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="skullfngj" index="" image="">
     <description>Skull Fang (Japan)</description>
     <cloneof>skullfng</cloneof>
@@ -176142,7 +177751,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
-    <buttons>2</buttons>
+    <buttons>3</buttons>
     <joyways>8</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
@@ -176157,7 +177766,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
-    <buttons>2</buttons>
+    <buttons>3</buttons>
     <joyways>8</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
@@ -176172,7 +177781,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
-    <buttons>2</buttons>
+    <buttons>3</buttons>
     <joyways>8</joyways>
     <score>3.9</score>
     <enabled>Yes</enabled>
@@ -176493,8 +178102,8 @@
     <crc>81244757</crc>
     <manufacturer>Nichibutsu</manufacturer>
     <year>1989</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
@@ -177145,7 +178754,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="smashdrv" index="" image="">
-    <description>Smashing Drive</description>
+    <description>Smashing Drive (UK)</description>
     <cloneof></cloneof>
     <crc>c9021dd7</crc>
     <manufacturer>Gaelco</manufacturer>
@@ -177886,6 +179495,20 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="snowcat" index="" image="">
+    <description>Snow Cat (0100405V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>9f9e2637</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="soccrrmt" index="" image="">
     <description>Soccer (Ramtek) [TTL]</description>
     <cloneof></cloneof>
@@ -179159,9 +180782,9 @@
   </game>
   <game name="spacea91_13e" index="" image="">
     <description>Space Ace (DL2 Conversion) (Euro v1.3)</description>
-    <cloneof>spacea91</cloneof>
+    <cloneof>spaceace</cloneof>
     <crc>27dd0486</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Cinematronics (Leland Corporation license)</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -179171,9 +180794,9 @@
   </game>
   <game name="spacea91" index="" image="">
     <description>Space Ace (DL2 Conversion) (US v1.3)</description>
-    <cloneof></cloneof>
+    <cloneof>spaceace</cloneof>
     <crc>de93a213</crc>
-    <manufacturer>Leland</manufacturer>
+    <manufacturer>Cinematronics (Leland Corporation license)</manufacturer>
     <year>1991</year>
     <genre></genre>
     <rating></rating>
@@ -179682,7 +181305,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
-    <buttons>1</buttons>
+    <buttons>2</buttons>
     <joyways>2</joyways>
     <score>2.8</score>
     <enabled>Yes</enabled>
@@ -179791,6 +181414,20 @@
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sdungeona" index="" image="">
+    <description>Space Dungeon (larger roms)</description>
+    <cloneof>sdungeon</cloneof>
+    <crc>e255af9a</crc>
+    <manufacturer>Taito America Corporation</manufacturer>
+    <year>1981</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Doublejoy</ctrltype>
+    <joyways>8</joyways>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="spacecho" index="" image="">
     <description>Space Echo (set 1)</description>
     <cloneof>speakres</cloneof>
@@ -181444,7 +183081,7 @@
   <game name="spcwarp" index="" image="">
     <description>Space Warp? (Cosmos conversion on Galaxian hardware)</description>
     <cloneof></cloneof>
-    <crc>da4cee6b</crc>
+    <crc>cbff6762</crc>
     <manufacturer>Century Electronics</manufacturer>
     <year>1983</year>
     <genre></genre>
@@ -181605,6 +183242,21 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="speakhlp" index="" image="">
+    <description>Speak &amp; Help</description>
+    <cloneof>speakres</cloneof>
+    <crc>08793ef7</crc>
+    <manufacturer>bootleg</manufacturer>
+    <year>1980</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>2</joyways>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="speakres" index="" image="">
     <description>Speak &amp; Rescue</description>
     <cloneof></cloneof>
@@ -181756,7 +183408,7 @@
     <year>2002</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -183578,6 +185230,21 @@
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="strfight" index="" image="">
+    <description>Star Fighter (bootleg of Astro Fighter)</description>
+    <cloneof>astrof</cloneof>
+    <crc>528034d3</crc>
+    <manufacturer>bootleg (VGG)</manufacturer>
+    <year>1979</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>2</joyways>
+    <score>2.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="starfigh" index="" image="">
     <description>Star Fighter (v1)</description>
     <cloneof></cloneof>
@@ -183769,9 +185436,24 @@
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="starhrse" index="" image="">
-    <description>Star Horse (big screens)</description>
-    <cloneof></cloneof>
+  <game name="shorsel" index="" image="">
+    <description>Star Horse (live and backup)</description>
+    <cloneof>shorse</cloneof>
+    <crc>1557297e</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="shorsem" index="" image="">
+    <description>Star Horse (main screens)</description>
+    <cloneof>shorse</cloneof>
     <crc>951684e4</crc>
     <manufacturer>Sega</manufacturer>
     <year>2000</year>
@@ -183781,10 +185463,10 @@
     <ctrltype>Joystick</ctrltype>
     <buttons>6</buttons>
     <joyways>8</joyways>
-    <score>2.8</score>
+    <score></score>
     <enabled>Yes</enabled>
   </game>
-  <game name="starhrcl" index="" image="">
+  <game name="shorse" index="" image="">
     <description>Star Horse (satellite)</description>
     <cloneof></cloneof>
     <crc>4929e940</crc>
@@ -183796,13 +185478,28 @@
     <ctrltype>Joystick</ctrltype>
     <buttons>6</buttons>
     <joyways>8</joyways>
-    <score>2.8</score>
+    <score></score>
     <enabled>Yes</enabled>
   </game>
-  <game name="starhrct" index="" image="">
-    <description>Star Horse (server)</description>
+  <game name="shors2k1" index="" image="">
+    <description>Star Horse 2001 (satellite, Rev B)</description>
     <cloneof></cloneof>
-    <crc>1557297e</crc>
+    <crc>bfce576f</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>2002</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="shorsepb" index="" image="">
+    <description>Star Horse Progress (backup data)</description>
+    <cloneof>shorsep</cloneof>
+    <crc>fe8f8f5c</crc>
     <manufacturer>Sega</manufacturer>
     <year>2000</year>
     <genre></genre>
@@ -183811,11 +185508,41 @@
     <ctrltype>Joystick</ctrltype>
     <buttons>6</buttons>
     <joyways>8</joyways>
-    <score>2.8</score>
+    <score></score>
     <enabled>Yes</enabled>
   </game>
-  <game name="starhrsp" index="" image="">
-    <description>Star Horse Progress (satellite) (Rev A)</description>
+  <game name="shorsepl" index="" image="">
+    <description>Star Horse Progress (live, Rev A)</description>
+    <cloneof>shorsep</cloneof>
+    <crc>99b64022</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>2003</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="shorsepm" index="" image="">
+    <description>Star Horse Progress (main screens, Rev B)</description>
+    <cloneof>shorsep</cloneof>
+    <crc>6491dd68</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>2003</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="shorsep" index="" image="">
+    <description>Star Horse Progress (satellite, Rev A)</description>
     <cloneof></cloneof>
     <crc>c3f0f06a</crc>
     <manufacturer>Sega</manufacturer>
@@ -183826,10 +185553,25 @@
     <ctrltype>Joystick</ctrltype>
     <buttons>6</buttons>
     <joyways>8</joyways>
-    <score>2.8</score>
+    <score></score>
     <enabled>Yes</enabled>
   </game>
-  <game name="starhrpr" index="" image="">
+  <game name="shorseps" index="" image="">
+    <description>Star Horse Progress (sound &amp; backup, Rev A)</description>
+    <cloneof>shorsep</cloneof>
+    <crc>bfbc3569</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>2003</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="shorsepr" index="" image="">
     <description>Star Horse Progress Returns (satellite)</description>
     <cloneof></cloneof>
     <crc>b6c40348</crc>
@@ -183841,7 +185583,7 @@
     <ctrltype>Joystick</ctrltype>
     <buttons>6</buttons>
     <joyways>8</joyways>
-    <score>2.8</score>
+    <score></score>
     <enabled>Yes</enabled>
   </game>
   <game name="starjack" index="" image="">
@@ -184709,6 +186451,21 @@
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="strgchmp" index="" image="">
+    <description>Steering Champ (GQ710 VER. UAA)</description>
+    <cloneof></cloneof>
+    <crc>a3e93d49</crc>
+    <manufacturer>Konami</manufacturer>
+    <year>1997</year>
+    <genre>Miscellaneous</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Pedal</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="stellcas" index="" image="">
     <description>Stellar Castle (Elettronolo)</description>
     <cloneof>starcas</cloneof>
@@ -185989,6 +187746,21 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sfex2u1" index="" image="">
+    <description>Street Fighter EX2 (USA 980312)</description>
+    <cloneof>sfex2</cloneof>
+    <crc>a63d6fa6</crc>
+    <manufacturer>Capcom / Arika</manufacturer>
+    <year>1998</year>
+    <genre>Fighter</genre>
+    <rating>AAMA - Red (Life Like Violence Strong)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score>4.2</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sfex2" index="" image="">
     <description>Street Fighter EX2 (USA 980526)</description>
     <cloneof></cloneof>
@@ -187009,6 +188781,21 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="sf2em" index="" image="">
+    <description>Street Fighter II: The World Warrior (World 910129)</description>
+    <cloneof>sf2</cloneof>
+    <crc>0fbd9270</crc>
+    <manufacturer>Capcom</manufacturer>
+    <year>1991</year>
+    <genre>Fighter</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="sf2eb" index="" image="">
     <description>Street Fighter II: The World Warrior (World 910214)</description>
     <cloneof>sf2</cloneof>
@@ -188351,7 +190138,7 @@
     <description>Strike Zone Baseball</description>
     <cloneof></cloneof>
     <crc>0c2fe514</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1988</year>
     <genre>Sports/Baseball</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -189025,7 +190812,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
@@ -189527,7 +191314,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -189542,7 +191329,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -189579,7 +191366,7 @@
     <description>Super Baseball Double Play Home Run Derby</description>
     <cloneof></cloneof>
     <crc>50fe6185</crc>
-    <manufacturer>Leland Corp. / Tradewest</manufacturer>
+    <manufacturer>Leland Corporation / Tradewest</manufacturer>
     <year>1987</year>
     <genre>Sports/Baseball</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -189906,7 +191693,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>18</buttons>
+    <score>2.4</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="sbuk3a" index="" image="">
+    <description>Super Bucks III (0100711V, NSW/ACT)</description>
+    <cloneof>sbuk3</cloneof>
+    <crc>0ce0ba8d</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -189920,7 +191721,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -190368,8 +192169,23 @@
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="suprgolf" index="" image="">
+  <game name="suprgolfj" index="" image="">
     <description>Super Crowns Golf (Japan)</description>
+    <cloneof>suprgolf</cloneof>
+    <crc>36edd88e</crc>
+    <manufacturer>Nasco</manufacturer>
+    <year>1989</year>
+    <genre>Sports/Golf</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Dial</ctrltype>
+    <buttons>4</buttons>
+    <joyways>2</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="suprgolf" index="" image="">
+    <description>Super Crowns Golf (World)</description>
     <cloneof></cloneof>
     <crc>36edd88e</crc>
     <manufacturer>Nasco</manufacturer>
@@ -190737,7 +192553,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>4</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -190884,7 +192700,7 @@
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>1</players>
-    <ctrltype>Joystick</ctrltype>
+    <ctrltype>Stick</ctrltype>
     <buttons>2</buttons>
     <joyways>2</joyways>
     <score>3.6</score>
@@ -190899,7 +192715,7 @@
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>1</players>
-    <ctrltype>Joystick</ctrltype>
+    <ctrltype>Stick</ctrltype>
     <buttons>2</buttons>
     <joyways>2</joyways>
     <score>3.6</score>
@@ -191327,8 +193143,8 @@
     <description>Super Glob (Pac-Man hardware) (German bootleg)</description>
     <cloneof>suprglob</cloneof>
     <crc>77245b66</crc>
-    <manufacturer>bootleg</manufacturer>
-    <year>1983</year>
+    <manufacturer>bootleg (Software Labor)</manufacturer>
+    <year>1984</year>
     <genre>Platform</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
@@ -191665,7 +193481,7 @@
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Trackball</ctrltype>
-    <buttons>11</buttons>
+    <buttons>3</buttons>
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -194576,7 +196392,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -194591,7 +196407,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -194722,8 +196538,23 @@
     <score></score>
     <enabled>Yes</enabled>
   </game>
-  <game name="svf" index="" image="">
+  <game name="svfo" index="" image="">
     <description>Super Visual Football: European Sega Cup</description>
+    <cloneof>svf</cloneof>
+    <crc>42338226</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1994</year>
+    <genre>Sports/Soccer</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>3.7</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="svf" index="" image="">
+    <description>Super Visual Football: European Sega Cup (Rev A)</description>
     <cloneof></cloneof>
     <crc>42338226</crc>
     <manufacturer>Sega</manufacturer>
@@ -195516,20 +197347,6 @@
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="swhr2v" index="" image="">
-    <description>Sweet Hearts II (01J01986, Venezuela)</description>
-    <cloneof>swhr2</cloneof>
-    <crc>bd7ead91</crc>
-    <manufacturer>Aristocrat</manufacturer>
-    <year>1995</year>
-    <genre></genre>
-    <rating></rating>
-    <players>1</players>
-    <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
-    <score>4.2</score>
-    <enabled>Yes</enabled>
-  </game>
   <game name="swtht2nz" index="" image="">
     <description>Sweet Hearts II (1VXFC5461, New Zealand)</description>
     <cloneof></cloneof>
@@ -195724,9 +197541,23 @@
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="swhr2" index="" image="">
+  <game name="swhr2v" index="" image="">
+    <description>Sweethearts II (01J01986, Venezuela)</description>
+    <cloneof>swhr2</cloneof>
+    <crc>bd7ead91</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.2</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="swhr2a" index="" image="">
     <description>Sweethearts II (0200004V, NSW/ACT)</description>
-    <cloneof></cloneof>
+    <cloneof>swhr2</cloneof>
     <crc>bde067d7</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1995</year>
@@ -195734,7 +197565,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>4.2</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="swhr2" index="" image="">
+    <description>Sweethearts II (0200465V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>dcf51719</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -195748,7 +197593,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.2</score>
     <enabled>Yes</enabled>
   </game>
@@ -196116,6 +197961,21 @@
     <score>3.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="defenderj" index="" image="">
+    <description>T.T. Defender</description>
+    <cloneof>defender</cloneof>
+    <crc>f122d9c9</crc>
+    <manufacturer>Taito Corporation</manufacturer>
+    <year>1980</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>5</buttons>
+    <joyways>vertical2</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="ttfitter" index="" image="">
     <description>T.T. Fitter (Japan)</description>
     <cloneof>roundup</cloneof>
@@ -196564,7 +198424,7 @@
     <genre>Driving</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>1</players>
-    <ctrltype>Joystick</ctrltype>
+    <ctrltype>Stick</ctrltype>
     <buttons>2</buttons>
     <joyways>2</joyways>
     <score>3.2</score>
@@ -197329,7 +199189,7 @@
   <game name="tangtang" index="" image="">
     <description>Tang Tang (ver. 0526, 26/05/2000)</description>
     <cloneof></cloneof>
-    <crc>f2dfb02d</crc>
+    <crc>00514989</crc>
     <manufacturer>ESD</manufacturer>
     <year>2000</year>
     <genre>Platform</genre>
@@ -197878,8 +199738,8 @@
     <crc>81244757</crc>
     <manufacturer>Nichibutsu</manufacturer>
     <year>1989</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
@@ -198490,7 +200350,7 @@
     <year>1991</year>
     <genre>Beat-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
-    <players>2</players>
+    <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
     <joyways>8</joyways>
@@ -198695,7 +200555,7 @@
   <game name="teetert" index="" image="">
     <description>Teeter Torture (prototype)</description>
     <cloneof></cloneof>
-    <crc>0fe70b00</crc>
+    <crc>e26f9053</crc>
     <manufacturer>Exidy</manufacturer>
     <year>1982</year>
     <genre>Shoot-'Em-Up</genre>
@@ -200800,6 +202660,8 @@
     <genre></genre>
     <rating></rating>
     <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>40</buttons>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -200812,6 +202674,8 @@
     <genre></genre>
     <rating></rating>
     <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>40</buttons>
     <score>3.6</score>
     <enabled>Yes</enabled>
   </game>
@@ -201134,9 +202998,9 @@
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="chariotca" index="" image="">
+  <game name="chariotc" index="" image="">
     <description>The Chariot Challenge (0100787V, NSW/ACT)</description>
-    <cloneof>chariotc</cloneof>
+    <cloneof></cloneof>
     <crc>b44cf571</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1998</year>
@@ -201144,13 +203008,13 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="chariotc" index="" image="">
-    <description>The Chariot Challenge (04J00714, NSW/ACT)</description>
-    <cloneof></cloneof>
+  <game name="chariotcv" index="" image="">
+    <description>The Chariot Challenge (04J00714, Venezuela)</description>
+    <cloneof>chariotc</cloneof>
     <crc>b8d4a5ec</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1998</year>
@@ -201158,7 +203022,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -201535,8 +203399,8 @@
     <genre>Casino</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>1</players>
-    <ctrltype>Buttons</ctrltype>
-    <buttons>6</buttons>
+    <ctrltype>Gambling</ctrltype>
+    <buttons>9</buttons>
     <score>1.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -201570,7 +203434,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dbldynj" index="" image="">
-    <description>The Double Dynamites (Japan)</description>
+    <description>The Double Dynamites (Japan, 13NOV89)</description>
     <cloneof></cloneof>
     <crc>9cbc7b41</crc>
     <manufacturer>Seibu Kaihatsu</manufacturer>
@@ -201585,7 +203449,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="dbldynu" index="" image="">
-    <description>The Double Dynamites (US)</description>
+    <description>The Double Dynamites (US, 13NOV89)</description>
     <cloneof>dbldynj</cloneof>
     <crc>9cbc7b41</crc>
     <manufacturer>Seibu Kaihatsu (Fabtek license)</manufacturer>
@@ -201801,7 +203665,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -202782,8 +204646,8 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="kof98ka" index="" image="">
-    <description>The King of Fighters '98 - The Slugfest / King of Fighters '98 - Dream Match Never Ends (Korean board 2)</description>
+  <game name="kof98k" index="" image="">
+    <description>The King of Fighters '98 - The Slugfest / King of Fighters '98 - Dream Match Never Ends (Korean board, set 1)</description>
     <cloneof>kof98</cloneof>
     <crc>c823e045</crc>
     <manufacturer>SNK</manufacturer>
@@ -202797,8 +204661,8 @@
     <score>4.7</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="kof98k" index="" image="">
-    <description>The King of Fighters '98 - The Slugfest / King of Fighters '98 - Dream Match Never Ends (Korean board)</description>
+  <game name="kof98ka" index="" image="">
+    <description>The King of Fighters '98 - The Slugfest / King of Fighters '98 - Dream Match Never Ends (Korean board, set 2)</description>
     <cloneof>kof98</cloneof>
     <crc>c823e045</crc>
     <manufacturer>SNK</manufacturer>
@@ -202884,6 +204748,21 @@
     <score>4.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="kof99ka" index="" image="">
+    <description>The King of Fighters '99 - Millennium Battle (Korean release, non-encrypted program)</description>
+    <cloneof>kof99</cloneof>
+    <crc>8d921c68</crc>
+    <manufacturer>SNK</manufacturer>
+    <year>1999</year>
+    <genre>Fighter</genre>
+    <rating>AAMA - Yellow (Animated Violence Mild)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>4.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="kof99h" index="" image="">
     <description>The King of Fighters '99 - Millennium Battle (NGH-2510)</description>
     <cloneof>kof99</cloneof>
@@ -203249,7 +205128,7 @@
     <cloneof></cloneof>
     <crc>b1fff0c8</crc>
     <manufacturer>Sammy / SNK Playmore</manufacturer>
-    <year>2005</year>
+    <year>2004</year>
     <genre></genre>
     <rating></rating>
     <players>2</players>
@@ -203264,7 +205143,7 @@
     <cloneof>kofnw</cloneof>
     <crc>b1fff0c8</crc>
     <manufacturer>Sammy / SNK Playmore</manufacturer>
-    <year>2005</year>
+    <year>2004</year>
     <genre></genre>
     <rating></rating>
     <players>2</players>
@@ -203304,6 +205183,18 @@
     <score>4.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="kofxii" index="" image="">
+    <description>The King of Fighters XII (v1.00)</description>
+    <cloneof></cloneof>
+    <crc></crc>
+    <manufacturer>SNK Playmore</manufacturer>
+    <year>2009</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="kingrt66" index="" image="">
     <description>The King of Route 66 (Rev A)</description>
     <cloneof></cloneof>
@@ -203921,7 +205812,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="tnzsop" index="" image="">
-    <description>The NewZealand Story (World, prototype?) (older PCB)</description>
+    <description>The NewZealand Story (World, prototype) (older PCB)</description>
     <cloneof>tnzs</cloneof>
     <crc>2ab06bda</crc>
     <manufacturer>Taito Corporation Japan</manufacturer>
@@ -203935,6 +205826,21 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="tnzsoa" index="" image="">
+    <description>The NewZealand Story (World, unknown version) (older PCB)</description>
+    <cloneof>tnzs</cloneof>
+    <crc>9800c54d</crc>
+    <manufacturer>Taito Corporation Japan</manufacturer>
+    <year>1988</year>
+    <genre>Platform</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>2</buttons>
+    <joyways>8</joyways>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="tnextspcj" index="" image="">
     <description>The Next Space (Japan)</description>
     <cloneof>tnextspc</cloneof>
@@ -204217,7 +206123,7 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="pitbossa" index="" image="">
+  <game name="pitboss03" index="" image="">
     <description>The Pit Boss (2214-03, U5-0C)</description>
     <cloneof>pitboss</cloneof>
     <crc>52298162</crc>
@@ -204228,10 +206134,10 @@
     <players>2</players>
     <ctrltype>Buttons</ctrltype>
     <buttons>7</buttons>
-    <score>1.9</score>
+    <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="pitbossa1" index="" image="">
+  <game name="pitboss03a" index="" image="">
     <description>The Pit Boss (2214-03, U5-1C)</description>
     <cloneof>pitboss</cloneof>
     <crc>52298162</crc>
@@ -204242,12 +206148,12 @@
     <players>2</players>
     <ctrltype>Buttons</ctrltype>
     <buttons>7</buttons>
-    <score>1.9</score>
+    <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="pitboss" index="" image="">
+  <game name="pitboss04" index="" image="">
     <description>The Pit Boss (2214-04)</description>
-    <cloneof></cloneof>
+    <cloneof>pitboss</cloneof>
     <crc>db62c5ec</crc>
     <manufacturer>Merit</manufacturer>
     <year>1983</year>
@@ -204259,7 +206165,21 @@
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="pitbossc" index="" image="">
+  <game name="pitboss" index="" image="">
+    <description>The Pit Boss (2214-07, U5-0A)</description>
+    <cloneof></cloneof>
+    <crc>50fbbada</crc>
+    <manufacturer>Merit</manufacturer>
+    <year>1983</year>
+    <genre>Casino</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Buttons</ctrltype>
+    <buttons>7</buttons>
+    <score>3.1</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="pitbossm4" index="" image="">
     <description>The Pit Boss (M4A1)</description>
     <cloneof>pitboss</cloneof>
     <crc>40c94dce</crc>
@@ -204270,10 +206190,10 @@
     <players>2</players>
     <ctrltype>Buttons</ctrltype>
     <buttons>7</buttons>
-    <score>1.9</score>
+    <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="pitbossb" index="" image="">
+  <game name="pitbossps" index="" image="">
     <description>The Pit Boss (PSB1)</description>
     <cloneof>pitboss</cloneof>
     <crc>52298162</crc>
@@ -204284,7 +206204,7 @@
     <players>2</players>
     <ctrltype>Buttons</ctrltype>
     <buttons>7</buttons>
-    <score>1.9</score>
+    <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
   <game name="sc4pir" index="" image="">
@@ -205492,6 +207412,20 @@
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="thor" index="" image="">
+    <description>Thor (0200319V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>a4b27820</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="trally" index="" image="">
     <description>Thrash Rally (ALM-003 ~ ALH-003)</description>
     <cloneof></cloneof>
@@ -206221,6 +208155,34 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="thndh" index="" image="">
+    <description>Thunder Heart (0200333V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>522b0459</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="thndha" index="" image="">
+    <description>Thunder Heart (0200334V, NSW/ACT)</description>
+    <cloneof>thndh</cloneof>
+    <crc>77c0d46d</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="theroes" index="" image="">
     <description>Thunder Heroes</description>
     <cloneof></cloneof>
@@ -207320,7 +209282,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="mag_time" index="" image="">
-    <description>Time Scanner (TS 2.0, Magnet System, prototype)</description>
+    <description>Time Scanner (TS 2.0, Magnet System)</description>
     <cloneof></cloneof>
     <crc>214c558c</crc>
     <manufacturer>EFO SA / Cedar</manufacturer>
@@ -207395,7 +209357,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="timetrv" index="" image="">
-    <description>Time Traveler</description>
+    <description>Time Traveler (set 1)</description>
     <cloneof></cloneof>
     <crc>a3d44219</crc>
     <manufacturer>Virtual Image Productions (Sega license)</manufacturer>
@@ -207409,6 +209371,21 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="timetrv2" index="" image="">
+    <description>Time Traveler (set 2)</description>
+    <cloneof>timetrv</cloneof>
+    <crc>c7998e2f</crc>
+    <manufacturer>Virtual Image Productions (Sega license)</manufacturer>
+    <year>1991</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
+    <score>3.8</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="timetunl" index="" image="">
     <description>Time Tunnel</description>
     <cloneof></cloneof>
@@ -207519,7 +209496,9 @@
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -207548,7 +209527,7 @@
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>3</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>2.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -207795,8 +209774,8 @@
     <crc>4e1f119c</crc>
     <manufacturer>Taito America Corporation (Romstar license)</manufacturer>
     <year>1986</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
@@ -207825,8 +209804,8 @@
     <crc>4e1f119c</crc>
     <manufacturer>Taito Corporation</manufacturer>
     <year>1986</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
@@ -207840,8 +209819,8 @@
     <crc>4e1f119c</crc>
     <manufacturer>Taito Corporation</manufacturer>
     <year>1986</year>
-    <genre></genre>
-    <rating></rating>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
     <players>2</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>2</buttons>
@@ -208151,14 +210130,14 @@
   <game name="topbana" index="" image="">
     <description>Top Banana (0100550V, NSW/ACT)</description>
     <cloneof></cloneof>
-    <crc>140a73bc</crc>
+    <crc>1c64b3b6</crc>
     <manufacturer>Aristocrat</manufacturer>
-    <year>199?</year>
+    <year>1997</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
@@ -208804,6 +210783,21 @@
     <score>3.1</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="topskatruo" index="" image="">
+    <description>Top Skater (USA)</description>
+    <cloneof>topskatr</cloneof>
+    <crc>cd95d0bf</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>3.1</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="topskatru" index="" image="">
     <description>Top Skater (USA, Revision A)</description>
     <cloneof>topskatr</cloneof>
@@ -209217,7 +211211,9 @@
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -209229,7 +211225,9 @@
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -209241,7 +211239,9 @@
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -209253,7 +211253,9 @@
     <year>1997</year>
     <genre></genre>
     <rating></rating>
-    <players>0</players>
+    <players>1</players>
+    <ctrltype>Keyboard</ctrltype>
+    <buttons>73</buttons>
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -209271,6 +211273,20 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="toutango" index="" image="">
+    <description>Toucan Tango (0100782V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>69f2acde</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="touchgok" index="" image="">
     <description>Touch &amp; Go (Korea, unprotected)</description>
     <cloneof>touchgo</cloneof>
@@ -210711,7 +212727,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -211728,7 +213744,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
@@ -212632,7 +214648,7 @@
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -212647,7 +214663,7 @@
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -212662,7 +214678,7 @@
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -212677,7 +214693,7 @@
     <players>4</players>
     <ctrltype>Joystick</ctrltype>
     <buttons>1</buttons>
-    <joyways>8</joyways>
+    <joyways>4</joyways>
     <score>3.7</score>
     <enabled>Yes</enabled>
   </game>
@@ -212766,7 +214782,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -212875,8 +214891,22 @@
     <enabled>Yes</enabled>
   </game>
   <game name="trpdlght" index="" image="">
-    <description>Tropical Delight (PHG0625-02, US)</description>
+    <description>Tropical Delight (0100269V, NSW/ACT)</description>
     <cloneof></cloneof>
+    <crc>88978d4e</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="trpdlghtu" index="" image="">
+    <description>Tropical Delight (PHG0625-02, US)</description>
+    <cloneof>trpdlght</cloneof>
     <crc>852e433e</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
@@ -212884,7 +214914,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
@@ -212999,6 +215029,18 @@
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="tsukande" index="" image="">
+    <description>Tsukande Toru Chicchi</description>
+    <cloneof></cloneof>
+    <crc>dc2dd5bc</crc>
+    <manufacturer>Konami</manufacturer>
+    <year>1995</year>
+    <genre></genre>
+    <rating></rating>
+    <players>0</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="tsurugi" index="" image="">
     <description>Tsurugi (ver EAB)</description>
     <cloneof></cloneof>
@@ -213345,8 +215387,23 @@
     <score>2.6</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="turbofrcu" index="" image="">
+    <description>Turbo Force (US)</description>
+    <cloneof>turbofrc</cloneof>
+    <crc>60ca0333</crc>
+    <manufacturer>Video System Co.</manufacturer>
+    <year>1991</year>
+    <genre>Shoot-'Em-Up</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>3</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>1</buttons>
+    <joyways>8</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="turbofrc" index="" image="">
-    <description>Turbo Force (old revision)</description>
+    <description>Turbo Force (World)</description>
     <cloneof></cloneof>
     <crc>60ca0333</crc>
     <manufacturer>Video System Co.</manufacturer>
@@ -214324,7 +216381,7 @@
     <description>U.N. Squadron (USA)</description>
     <cloneof></cloneof>
     <crc>ad52b90c</crc>
-    <manufacturer>Capcom / Daipro</manufacturer>
+    <manufacturer>Capcom</manufacturer>
     <year>1989</year>
     <genre>Shoot-'Em-Up</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -215072,7 +217129,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
+    <score>2.5</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="unicornda" index="" image="">
+    <description>Unicorn Dreaming (0100813V, NSW/ACT)</description>
+    <cloneof>unicornd</cloneof>
+    <crc>b712dcd1</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -215086,7 +217157,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -215502,8 +217573,23 @@
     <score>3.0</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="vblokbrk" index="" image="">
+  <game name="vblokbrka" index="" image="">
     <description>VS Block Breaker (Asia)</description>
+    <cloneof>vblokbrk</cloneof>
+    <crc>e6535c05</crc>
+    <manufacturer>Kaneko / Mediaworks</manufacturer>
+    <year>1997</year>
+    <genre>Breakout</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Dial</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>2.4</score>
+    <enabled>Yes</enabled>
+  </game>
+  <game name="vblokbrk" index="" image="">
+    <description>VS Block Breaker (Europe)</description>
     <cloneof></cloneof>
     <crc>e6535c05</crc>
     <manufacturer>Kaneko / Mediaworks</manufacturer>
@@ -218020,7 +220106,7 @@
     <description>Viper</description>
     <cloneof></cloneof>
     <crc>1c1e7a49</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1988</year>
     <genre>Shooter</genre>
     <rating>AAMA - Yellow (Animated Violence Mild)</rating>
@@ -218195,6 +220281,21 @@
     <score>3.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="vbowlhk" index="" image="">
+    <description>Virtua Bowling (Hong Kong, V101HJS)</description>
+    <cloneof>vbowl</cloneof>
+    <crc>f62cf8ed</crc>
+    <manufacturer>IGS / Tai Tin Amusement</manufacturer>
+    <year>1996</year>
+    <genre>Sports/Bowling</genre>
+    <rating>AAMA - Green (Suitable For All Ages)</rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>4.4</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="vbowlj" index="" image="">
     <description>Virtua Bowling (Japan, V100JCM)</description>
     <cloneof>vbowl</cloneof>
@@ -218817,6 +220918,21 @@
     <score>3.9</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="vs29915" index="" image="">
+    <description>Virtua Striker 2 '99 (Step 1.5)</description>
+    <cloneof>vs2v991</cloneof>
+    <crc>6cedd292</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1999</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>3.9</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="vs2v991" index="" image="">
     <description>Virtua Striker 2 '99.1 (Revision B)</description>
     <cloneof></cloneof>
@@ -219125,6 +221241,21 @@
     <score>2.8</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="von2a" index="" image="">
+    <description>Virtual On 2: Oratorio Tangram (Revision A)</description>
+    <cloneof>von2</cloneof>
+    <crc>3ecb2606</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1998</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>4</buttons>
+    <joyways>8</joyways>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="von2" index="" image="">
     <description>Virtual On 2: Oratorio Tangram (Revision B)</description>
     <cloneof></cloneof>
@@ -221232,6 +223363,21 @@
     <score>1.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="wangmid2o" index="" image="">
+    <description>Wangan Midnight Maximum Tune 2 (Export) (GDX-0016)</description>
+    <cloneof>wangmid2</cloneof>
+    <crc>75c716aa</crc>
+    <manufacturer>Namco</manufacturer>
+    <year>2005</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score>1.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="wangmid2" index="" image="">
     <description>Wangan Midnight Maximum Tune 2 (Export) (Rev A) (GDX-0016A)</description>
     <cloneof></cloneof>
@@ -222335,7 +224481,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -222798,6 +224944,20 @@
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="wikwin" index="" image="">
+    <description>Wicked Winnings (0100553V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>06cf5d68</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="wikwin2" index="" image="">
     <description>Wicked Winnings II - Power Pay (10214011, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -222847,27 +225007,27 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="wamazon" index="" image="">
+  <game name="wamazona" index="" image="">
     <description>Wild Amazon (0200285V, NSW/ACT)</description>
-    <cloneof></cloneof>
-    <crc>2cd12986</crc>
+    <cloneof>wamazon</cloneof>
+    <crc>fdb10dd3</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1996</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>22</buttons>
     <score>1.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="wamazona" index="" image="">
+  <game name="wamazon" index="" image="">
     <description>Wild Amazon (0200507V, NSW/ACT)</description>
-    <cloneof>wamazon</cloneof>
+    <cloneof></cloneof>
     <crc>2e24756a</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1996</year>
@@ -222875,10 +225035,24 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>1.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="wldangel" index="" image="">
+    <description>Wild Angels (0100337V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>81f0d1c8</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="wldarrow" index="" image="">
     <description>Wild Arrow (color, Standard V4.8)</description>
     <cloneof></cloneof>
@@ -222903,7 +225077,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
@@ -223195,21 +225369,21 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>23</buttons>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
   <game name="wcougaru" index="" image="">
     <description>Wild Cougar (NHG0296-04, US)</description>
     <cloneof>wcougar</cloneof>
-    <crc>fe2bafdc</crc>
+    <crc>6909acb0</crc>
     <manufacturer>Aristocrat</manufacturer>
     <year>1997</year>
     <genre></genre>
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
@@ -223519,7 +225693,7 @@
     <rating></rating>
     <players>1</players>
     <ctrltype>Keypad</ctrltype>
-    <buttons>26</buttons>
+    <buttons>21</buttons>
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
@@ -224766,6 +226940,20 @@
     <score>3.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="wnpost" index="" image="">
+    <description>Winning Post (RHG0418-04, US)</description>
+    <cloneof></cloneof>
+    <crc>ff70b305</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1997</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>21</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="winrun" index="" image="">
     <description>Winning Run</description>
     <cloneof></cloneof>
@@ -225895,6 +228083,20 @@
     <score>4.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="wizways" index="" image="">
+    <description>Wizard Ways (0200396V, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>934d7286</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>1996</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="wzwaysll" index="" image="">
     <description>Wizard Ways - Lady Luck (20139111, NSW/ACT)</description>
     <cloneof></cloneof>
@@ -227424,6 +229626,21 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="wldkicksj" index="" image="">
+    <description>World Kicks (Japan, WK1 Ver.A)</description>
+    <cloneof>wldkicks</cloneof>
+    <crc>e96f312c</crc>
+    <manufacturer>Namco</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>2</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>6</buttons>
+    <joyways>8</joyways>
+    <score>4.3</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="wldkicks" index="" image="">
     <description>World Kicks (US, WK3 Ver.A)</description>
     <cloneof></cloneof>
@@ -227439,7 +229656,7 @@
     <score>4.3</score>
     <enabled>Yes</enabled>
   </game>
-  <game name="wldkicksj" index="" image="">
+  <game name="wldkickspj" index="" image="">
     <description>World Kicks PCB (Japan, WKC1 Ver.A)</description>
     <cloneof>wldkicks</cloneof>
     <crc>e96f312c</crc>
@@ -227589,7 +229806,7 @@
     <description>World Soccer Finals</description>
     <cloneof></cloneof>
     <crc>5bd0633d</crc>
-    <manufacturer>Leland Corp.</manufacturer>
+    <manufacturer>Leland Corporation</manufacturer>
     <year>1990</year>
     <genre>Sports/Soccer</genre>
     <rating>AAMA - Green (Suitable For All Ages)</rating>
@@ -228696,7 +230913,7 @@
     <enabled>Yes</enabled>
   </game>
   <game name="mag_xain" index="" image="">
-    <description>Xain'd Sleena (SC 3.0, Magnet System, prototype)</description>
+    <description>Xain'd Sleena (SC 3.0, Magnet System)</description>
     <cloneof></cloneof>
     <crc>5647849f</crc>
     <manufacturer>EFO SA / Cedar</manufacturer>
@@ -229537,6 +231754,20 @@
     <score>2.4</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="yukongl5" index="" image="">
+    <description>Yukon Gold (03J00191, NSW/ACT)</description>
+    <cloneof></cloneof>
+    <crc>e514b87f</crc>
+    <manufacturer>Aristocrat</manufacturer>
+    <year>2000</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <ctrltype>Keypad</ctrltype>
+    <buttons>23</buttons>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="yukongld" index="" image="">
     <description>Yukon Gold (Russian)</description>
     <cloneof></cloneof>
@@ -229741,6 +231972,21 @@
     <score>3.5</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="znpwfvt" index="" image="">
+    <description>Zen Nippon Pro-Wrestling Featuring Virtua (T 971123 V1.000)</description>
+    <cloneof>znpwfv</cloneof>
+    <crc>58356050</crc>
+    <manufacturer>Sega</manufacturer>
+    <year>1997</year>
+    <genre>Sports/Wrestling</genre>
+    <rating>AAMA - Yellow (Life Like Violence Mild)</rating>
+    <players>4</players>
+    <ctrltype>Joystick</ctrltype>
+    <buttons>3</buttons>
+    <joyways>8</joyways>
+    <score>3.5</score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="findlove" index="" image="">
     <description>Zenkoku Seifuku Bishoujo Grand Prix Find Love (J 971212 V1.000)</description>
     <cloneof></cloneof>
@@ -230494,7 +232740,7 @@
   <game name="zombraidpj" index="" image="">
     <description>Zombie Raid (9/28/95, Japan, prototype PCB)</description>
     <cloneof>zombraid</cloneof>
-    <crc>d90f78b2</crc>
+    <crc>1a4b2ee8</crc>
     <manufacturer>Sammy Industries Co.,Ltd.</manufacturer>
     <year>1995</year>
     <genre>Gun</genre>
@@ -230508,7 +232754,7 @@
   <game name="zombraid" index="" image="">
     <description>Zombie Raid (9/28/95, US)</description>
     <cloneof></cloneof>
-    <crc>e3c431de</crc>
+    <crc>1a4b2ee8</crc>
     <manufacturer>American Sammy</manufacturer>
     <year>1995</year>
     <genre>Gun</genre>
@@ -230522,7 +232768,7 @@
   <game name="zombraidp" index="" image="">
     <description>Zombie Raid (9/28/95, US, prototype PCB)</description>
     <cloneof>zombraid</cloneof>
-    <crc>d90f78b2</crc>
+    <crc>1a4b2ee8</crc>
     <manufacturer>American Sammy</manufacturer>
     <year>1995</year>
     <genre>Gun</genre>
@@ -230620,6 +232866,18 @@
     <score>4.0</score>
     <enabled>Yes</enabled>
   </game>
+  <game name="zoofari" index="" image="">
+    <description>Zoofari</description>
+    <cloneof></cloneof>
+    <crc>e629689a</crc>
+    <manufacturer>ICE/Play Mechanix</manufacturer>
+    <year>2006</year>
+    <genre></genre>
+    <rating></rating>
+    <players>1</players>
+    <score></score>
+    <enabled>Yes</enabled>
+  </game>
   <game name="zoom909" index="" image="">
     <description>Zoom 909</description>
     <cloneof>buckrog</cloneof>
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 4115516..446d72f 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -20,7 +20,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "8";
-std::string retrofe_version_build = "0 - RC1";
+std::string retrofe_version_build = "0";
 
 
 std::string Version::getString()