diff --git a/lib/flag_quiz/flags.ex b/lib/flag_quiz/flags.ex
index dcbd55e..6c36c04 100644
--- a/lib/flag_quiz/flags.ex
+++ b/lib/flag_quiz/flags.ex
@@ -65,7 +65,7 @@ defmodule FlagQuiz.Flags do
        "Kongo-Kinshasa",
        "Kinshasan Kongo"
      ]},
-    {"CF", ["Central African Republic", "Keski-Afrikka"]},
+    {"CF", ["Central African Republic", "Central Africa", "Keski-Afrikka"]},
     {"CG", ["Congo", "Congo Rebublic", "Kongo", "Kongon tasavalta"]},
     {"CH", ["Switzerland", "Sveitsi"]},
     {"CI", ["Côte d'Ivoire", "Ivory Coast", "Norsunluurannikko"]},
@@ -90,7 +90,7 @@ defmodule FlagQuiz.Flags do
     {"EC", ["Ecuador"]},
     {"EE", ["Estonia", "Viro"]},
     {"EG", ["Egypt", "Egypti"]},
-    {"EH", ["Western Sahara", "Länsi-Sahara"]},
+    # {"EH", ["Western Sahara", "Länsi-Sahara"]},
     {"ER", ["Eritrea"]},
     {"ES", ["Spain", "Espanja"]},
     {"ET", ["Ethiopia", "Etiopia"]},
@@ -150,7 +150,7 @@ defmodule FlagQuiz.Flags do
        "Pohjois-Korea"
      ]},
     {"KR", ["Korea, Republic of", "Korea", "Republic of Korea", "South Korea", "Etelä-Korea"]},
-    {"KW", ["Kuwait", "Kuwait"]},
+    {"KW", ["Kuwait"]},
     # {"KY", ["Cayman Islands"]},
     {"KZ", ["Kazakhstan", "Kazakstan"]},
     {"LA", ["Lao People's Democratic Republic", "Laos"]},
@@ -163,7 +163,7 @@ defmodule FlagQuiz.Flags do
     {"LT", ["Lithuania", "Liettua"]},
     {"LU", ["Luxembourg", "Luxemburg"]},
     {"LV", ["Latvia"]},
-    {"LY", ["Libya", "Libya"]},
+    {"LY", ["Libya"]},
     {"MA", ["Morocco", "Marokko"]},
     {"MC", ["Monaco"]},
     {"MD", ["Moldova, Republic of", "Moldova"]},
@@ -211,7 +211,7 @@ defmodule FlagQuiz.Flags do
     # {"PM", ["Saint Pierre and Miquelon"]},
     # {"PN", ["Pitcairn"]},
     # {"PR", ["Puerto Rico"]},
-    {"PS", ["Palestine", "Palestiina", "Palestiinalaisalueet"]},
+    # {"PS", ["Palestine", "Palestiina", "Palestiinalaisalueet"]},
     {"PT", ["Portugal", "Portugali"]},
     {"PW", ["Palau"]},
     {"PY", ["Paraguay"]},
@@ -256,7 +256,7 @@ defmodule FlagQuiz.Flags do
     {"TR", ["Turkey", "Turkki"]},
     {"TT", ["Trinidad and Tobago", "Trinidad ja Tobaco"]},
     {"TV", ["Tuvalu"]},
-    {"TW", ["Taiwan"]},
+    {"TW", ["Taiwan", "Republic of China"]},
     {"TZ", ["Tanzania, United Republic of", "Tanzania", "Tansania"]},
     {"UA", ["Ukraine", "Ukraina"]},
     {"UG", ["Uganda"]},
diff --git a/lib/flag_quiz_web/live/page_live.ex b/lib/flag_quiz_web/live/page_live.ex
index 9677c82..b42a17f 100644
--- a/lib/flag_quiz_web/live/page_live.ex
+++ b/lib/flag_quiz_web/live/page_live.ex
@@ -88,13 +88,15 @@ defmodule FlagQuizWeb.PageLive do
     name
     |> String.downcase()
     |> String.normalize(:nfc)
-    |> String.replace(" and the ", " & ")
+    |> String.replace("the ", "")
     |> String.replace(" and ", " & ")
     |> String.replace(" ja ", " & ")
+    |> String.replace("saint ", "st ")
     |> String.replace(["ä", "ã", "é", "í", "ö", "ô", "š", "ž", "ç"], &replace_special/1)
     |> String.replace(~R/\s*/, "")
     |> String.replace("-", "")
     |> String.replace("'", "")
+    |> String.replace(",", "")
   end
 
   defp replace_special(char)