diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index c4d7e2b14..3bd996cbb 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -51540,7 +51540,7 @@ LSP-99019201:
 LSP-99019301:
   name: "Every Child Can Succeed 3 (USA)"
   codes:
-    - LSP99019401
+    - LSP99019301
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -58567,7 +58567,7 @@ SLES-02081:
     publisher: "Squaresoft"
     developer: "Squaresoft"
     releaseDate: "1999-10-27"
-    genre: "** DEMO **"
+    genre: "RPG"
     languages:
       - French
     minPlayers: 1
@@ -98411,6 +98411,7 @@ LSP-905406:
   name: "Math on the Move! 2 - Multiplication-Division Intermediate (USA)"
   codes:
     - LSP905406
+    - LSP10011101
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -101197,7 +101198,7 @@ SLUS-00594:
     publisher: "Konami"
     developer: "KCE Japan"
     releaseDate: "1998-10-21"
-    genre: "** DEMO **"
+    genre: "Action / Adventure / Strategy / Shooter"
     languages:
       - English
     minPlayers: 1
@@ -103918,6 +103919,7 @@ LSP-905017:
   name: "Mona & Moki 1 - Drive Me Wild! (USA)"
   codes:
     - LSP905017
+    - LSP05010101
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -103928,6 +103930,7 @@ LSP-905024:
   name: "Mona & Moki 2 - Drive Me Wilder! (USA)"
   codes:
     - LSP905024
+    - LSP05010201
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -119636,6 +119639,7 @@ LSP-060190:
   name: "P.K.'s Math Studio (USA)"
   codes:
     - LSP060190
+    - LSP06019001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -119682,6 +119686,7 @@ LSP-180410:
   name: "P.K.'s Place 4 - Daphne and the Seventh Wonder (USA)"
   codes:
     - LSP180410
+    - LSP18041001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -119984,8 +119989,12 @@ SCED-03920:
     genre: "** DEMO **"
 SCED-03238:
   name: "PS One Kids Autumn 2000 (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03340:
   name: "PS One Kids Autumn 2000 (France) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03175:
   name: "PS One Special Demo 01 (Europe) (En,Fr,De,Es,It)"
   metadata:
@@ -119994,11 +120003,15 @@ SCUS-94696:
   name: "PS One Winter 03 Kiosk Version 1.21 (USA)"
 SCUS-94799:
   name: "PSone - Wherever, Whenever, Forever. (USA) (EDC)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1445-ge5c46a54"
 SCED-04019:
   name: "PSone Xmas Special (France)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-18002:
   name: "PaRappa the Rapper (Japan)"
   controllers:
@@ -129192,7 +129205,7 @@ SLES-03962:
     publisher: "Midas Interactive"
     developer: "Tamsoft Corporation"
     releaseDate: "2004-02-27"
-    genre: "** DEMO **"
+    genre: "Driving / Racing"
     languages:
       - English
     minPlayers: 1
@@ -130496,6 +130509,7 @@ LSP-905314:
   name: "Quaddle Family Mysteries, The 1 - The Case of the Scarce Scarab - Lobby & Kitchen (USA)"
   codes:
     - LSP905314
+    - LSP06010101
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -130506,6 +130520,7 @@ LSP-905321:
   name: "Quaddle Family Mysteries, The 2 - The Case of the Scarce Scarab - Garden (USA)"
   codes:
     - LSP905321
+    - LSP06010201
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -130516,6 +130531,7 @@ LSP-905338:
   name: "Quaddle Family Mysteries, The 3 - The Case of the Scarce Scarab - Parlor & Family Room (USA)"
   codes:
     - LSP905338
+    - LSP06010301
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -137571,6 +137587,12 @@ LSP-907127:
   codes:
     - LSP-907127
     - LSP-907127001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-02326:
   name: "Roadsters (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -142497,6 +142519,14 @@ LSP-020650:
       - English
 LSP-020780:
   name: "Secret of Googol 8, The - Googol Gulch - General Store & Math Arcade (USA)"
+  codes:
+    - LSP02078001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPM-86230:
   name: "Segare Ijiri (Japan)"
   controllers:
@@ -157539,6 +157569,7 @@ LSP-907011:
   name: "Str.at.e.s. 1 - Match-A-Batch (USA)"
   codes:
     - LSP907011
+    - LSP03010101
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -157627,6 +157658,7 @@ LSP-907080:
   name: "Str.at.e.s. 8 - Riddle Wrangler! (USA)"
   codes:
     - LSP907080
+    - LSP03010801
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -169436,6 +169468,7 @@ LSP-903174:
   codes:
     - LSP-903174
     - LSP-90317401
+    - LSP90317401
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -169447,6 +169480,7 @@ LSP-903181:
   codes:
     - LSP-903181
     - LSP-90318101
+    - LSP90318101
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -170435,6 +170469,7 @@ LSP-907363:
     - LSP-907363
     - LSP90736300
     - LSP-90736300
+    - LSP90736300
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -170447,6 +170482,7 @@ LSP-907370:
     - LSP-907370
     - LSP90737000
     - LSP-90737001
+    - LSP90737001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -178468,6 +178504,7 @@ LSP-909022:
     - DigitalController
   codes:
     - LSP909022
+    - LSP90902200
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
@@ -193158,3 +193195,19 @@ SLPM-80638:
   name: "Inuyasha - Sengoku Otogi Gassen (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
+NYMC-02020:
+  name: "Magic Castle"
+  metadata:
+    publisher: "http://netyaroze.com"
+    developer: "Kaiga"
+    genre: "RPG - Roguelike"
+    releaseDate: "2020-12-24"
+    languages:
+      - English
+      - Spanish
+      - Italian
+      - Portuguese
+      - Turkish
+      - Japanese
+    minPlayers: 1
+    maxPlayers: 4