diff --git a/EU4ToVic3/Data_Files/configurables/country_mappings.txt b/EU4ToVic3/Data_Files/configurables/country_mappings.txt
index d86fe7470..0f5b718d0 100644
--- a/EU4ToVic3/Data_Files/configurables/country_mappings.txt
+++ b/EU4ToVic3/Data_Files/configurables/country_mappings.txt
@@ -119,6 +119,8 @@ link = { name = "Grao-Para" vic3 = PRA } # Grão-Pará
 link = { name = "Grão-Pará" vic3 = PRA } # Grão-Pará
 link = { eu4 = SPI name = "Sardinia-Piedmont" vic3 = SAR } # Sardinia-Piedmont
 link = { eu4 = TTS name = "Two Sicilies" vic3 = SIC } # Two Sicilies
+link = { eu4 = SIC name = "Sicily" vic3 = SIC } # Sicily
+link = { eu4 = NAP name = "Naples" vic3 = SIC } # Sicily
 link = { name = Trieste vic3 = TRE } # Trieste
 link = { eu4 = TUS name = "Toscana" vic3 = TUS } # Tuscany
 link = { eu4 = ETR vic3 = TUS } # Eturia => Tuscany
@@ -177,7 +179,7 @@ link = { eu4 = HED name = "Hedjaz" vic3 = HDJ } # Hedjaz
 link = { eu4 = IRQ name = "Mesopotamia" vic3 = IRQ } # Iraq
 link = { eu4 = KHI name = "Khiva" vic3 = KHI } # Khiva
 link = { eu4 = KOK vic3 = KOK } # Ferghana => Kokand
-link = { eu4 = KZH name = "Kazakh" vic3 = KAZ } # Kazakhstan -> Kazakhstan
+link = { eu4 = KZH name = "Kazakh" vic3 = KAZ } # Kazakh => Kazakhstan
 link = { eu4 = MUG name = "Mughals" vic3 = MUG } # Mughals
 link = { eu4 = NAJ name = "Nejd" vic3 = NEJ } # Nejd
 link = { name = "Saudi Arabia" vic3 = NEJ } # Saudi Arabia
@@ -201,6 +203,7 @@ link = { name = "Bhopal" vic3 = BHO } # Bhopal
 link = { eu4 = JAN name = "Jangladesh" vic3 = BIK } # Jangladesh => Bikaner
 link = { eu4 = BND name = "Bundelkhand" vic3 = BUN } # Bundelkhand
 link = { eu4 = GWA name = "Gwalior" vic3 = GWA } # Gwalior
+link = { name = "Dravida" vic3 = DRA } # Dravida (I:R)
 link = { eu4 = DEC name = "Deccan Empire" vic3 = HYD } # Deccan => Hyderabad
 link = { name = "Indore" vic3 = IND } # Indore
 link = { name = "Jaipur" vic3 = JAI } # Jaipur
@@ -341,7 +344,7 @@ link = { name = "Selk'nam" vic3 = SLK } # Selk'nam
 link = { eu4 = TOG vic3 = TNG } # Tonga
 link = { eu4 = WSI vic3 = WIN } # West Indies
 link = { eu4 = MAY vic3 = MAY } # Maya
-link = { name = "Greater Iberia" vic3 = IBE } # Iberia from I:R
+link = { name = "Greater Iberia" vic3 = IBE } # Iberia (I:R)
 link = { name = "Oregon" vic3 = ORG } # Oregon
 link = { eu4 = COM name = "Comanche" vic3 = COM } # Comanche
 link = { name = "Indian Territory" vic3 = SEQ } # Indian Territory
@@ -355,7 +358,7 @@ link = { name = "Absaroka" vic3 = ABS } # Absaroka
 #link = { eu4 = WCR vic3 = IRC } # Cree => Iron Confederacy (Done through "Merge Nations")
 link = { eu4 = PRY name = "Jamaica" vic3 = JAM } # Port Royal => Jamaica
 link = { eu4 = NSS name = "Bahamas" vic3 = BAH } # New Providence => Bahamas
-link = { name = "Puerto Rico" vic3 = PCO } # Puerto  Rico
+link = { name = "Puerto Rico" vic3 = PCO } # Puerto Rico
 link = { eu4 = MIS name = "Miskito" vic3 = MKT } # Miskito
 link = { eu4 = AZT vic3 = NAH } # Aztec => Anahuac
 link = { name = "Greenland" vic3 = GRN } # Greenland
@@ -434,7 +437,7 @@ link = { eu4 = LEB name = "Lebanon" vic3 = LEB } # Lebanon
 link = { name = "Phoenicia" vic3 = LEB } # Phoenicia => Lebanon
 #link = { eu4 = ??? vic3 = HNA } # Hunan
 #link = { eu4 = ??? vic3 = AHU } # Anhui
-link = { eu4 = YAN vic3 = ZHI } # Yan => Zhili ((Primary Culture)
+link = { eu4 = YAN vic3 = ZHI } # Yan => Zhili (Primary Culture)
 #link = { eu4 = JIN vic3 = SHN } # Jin => Shanxi (Jin was still used as a synonym for Shanxi during Vic3's time)
 #link = { eu4 = ??? vic3 = GUI } # Guizhou
 link = { eu4 = CGS vic3 = GNG } # Changsheng => Guangxi
@@ -476,7 +479,7 @@ link = { name = "Tatarstan" vic3 = TAR } # Tatarstan
 link = { eu4 = KAZ name = "Kazan" vic3 = TAR } # Kazan -> Tatarstan
 link = { eu4 = BSH name = "Bashkiria" vic3 = BKR } # Bashkiria
 link = { eu4 = BRT name = "Buryatia" vic3 = BRY } # Buryatia
-link = { eu4 = KMC name = "Kamchadals" vic3 = KMC } # Kamchadals => Kamchatka
+#link = { eu4 = KMC name = "Kamchadals" vic3 = KMC } Kamchadals is an EU4 misnomer
 link = { name = "Kamchatka" vic3 = KMC } # Kamchatka
 link = { eu4 = CHU name = "Chukchi" vic3 = CKC } # Chukchi => Chukotka
 link = { eu4 = OIR name = "Oirat" vic3 = ALI } # Oirat => Altai
@@ -545,7 +548,6 @@ link = { eu4 = RJP name = "Rajputana" vic3 = RAJ } # Rajputana
 link = { name = "Maharashtra" vic3 = MHR } # Maharashtra
 link = { name = "Maharastra" vic3 = MHR } # Maharas(h)tra
 link = { eu4 = GUJ name = "Gujarat" vic3 = GUJ } # Gujarat
-link = { name = "Dravida Nadu" vic3 = DRA } # Dravida Nadu
 link = { eu4 = KOC name = "Kochin" vic3 = COC } # Kochin/Cochin
 link = { eu4 = ALA name = "Alaska" vic3 = ALK } # Alaska
 #link = { name = "???" vic3 = BCE } # British Ceylon
@@ -919,7 +921,7 @@ link = { eu4 = IND vic3 = I04 } # Indrapura
 #link = { eu4 = ??? vic3 = I06 } # Igorot
 #link = { eu4 = ??? vic3 = I07 } # Ibalon
 #link = { eu4 = ??? vic3 = I08 } # Iwaidjan
-#link = { eu4 = ??? vic3 = I09 } # Itelmens
+link = { eu4 = KMC name = "Kamchadals" vic3 = I09 } # Kamchadals => Itelmens
 #link = { eu4 = ??? vic3 = I10 } # Ilmenia
 #link = { eu4 = ??? vic3 = IB0 } # Isles of the Blest
 #link = { eu4 = ??? vic3 = IC0 } # Insee Cait
@@ -989,6 +991,7 @@ link = { eu4 = LAR vic3 = L09 } # Larrakia
 #link = { eu4 = ??? vic3 = L13 } # Léon (Breton)
 #link = { eu4 = ??? vic3 = L14 } # Laigin
 link = { eu4 = LVA vic3 = L15 } # Livonia
+link = { eu4 = LIV vic3 = L15 } # (Livonia)n Order
 link = { eu4 = ARW vic3 = L16 } # Arawak => Lokono
 #link = { eu4 = ??? vic3 = LC1 } # Lukku-Cairi
 #link = { eu4 = ??? vic3 = LF1 } # Lenca Federation
diff --git a/EU4ToVic3/Data_Files/configurables/culture_map.txt b/EU4ToVic3/Data_Files/configurables/culture_map.txt
index 009bed7cd..1018d28b2 100644
--- a/EU4ToVic3/Data_Files/configurables/culture_map.txt
+++ b/EU4ToVic3/Data_Files/configurables/culture_map.txt
@@ -135,18 +135,18 @@ link = { vic3 = caribeno @spanish_cultures region = region_caribbean }
 link = { vic3 = central_american @spanish_cultures region = region_central_america }
 link = { vic3 = mexican @spanish_cultures region = region_mexico }
 link = { vic3 = mexican eu4 = mexican neoculture_override = yes }
-### PDX went a bit overboard with all these cultures which are essentially identical. They only make sense for a very messy south america
-# which is uncommon for EU4 games. Unsure if it's worthwile or beneficial to link and use these. Needless to say, they don't have EU4 coutnerparts.
-# I'm enabling them for now, though, for historical reasons and flavor maybe. They are all linked to spanish anyway.
-link = { vic3 = peruvian @spanish_cultures owner = SPU owner = NPU owner = PBC owner = PEU }
-link = { vic3 = bolivian @spanish_cultures owner = BOL }
-link = { vic3 = ecuadorian @spanish_cultures owner = ECU owner = EQT }
-link = { vic3 = chilean @spanish_cultures owner = CHL }
-link = { vic3 = venezuelan @spanish_cultures owner = VNZ }
-link = { vic3 = argentine @spanish_cultures owner = ARG owner = PLT }
-link = { vic3 = uruguayan @spanish_cultures owner = URU }
-link = { vic3 = paraguayan @spanish_cultures owner = PRG }
-link = { vic3 = colombian @spanish_cultures owner = GCO owner = CLM }
+### PDX created the following cultures for when their respective countries gain independence. 
+# We should not map to them at the start.
+#link = { vic3 = peruvian @spanish_cultures owner = SPU owner = NPU owner = PBC owner = PEU }
+#link = { vic3 = bolivian @spanish_cultures owner = BOL }
+#link = { vic3 = ecuadorian @spanish_cultures owner = ECU owner = EQT }
+#link = { vic3 = chilean @spanish_cultures owner = CHL }
+#link = { vic3 = venezuelan @spanish_cultures owner = VNZ }
+#link = { vic3 = argentine @spanish_cultures owner = ARG owner = PLT }
+#link = { vic3 = uruguayan @spanish_cultures owner = URU }
+#link = { vic3 = paraguayan @spanish_cultures owner = PRG }
+#link = { vic3 = colombian @spanish_cultures owner = GCO owner = CLM }
+
 link = { vic3 = north_andean @spanish_cultures region = region_gran_colombia }
 link = { vic3 = platinean @spanish_cultures region = region_la_plata }
 link = { vic3 = platinean eu4 = platinean neoculture_override = yes }
@@ -597,7 +597,7 @@ link = { vic3 = zulu eu4 = nguni region = STATE_ZULULAND }
 
 link = { vic3 = chewa eu4 = nyasa }
 link = { vic3 = khoisan eu4 = khoisan }
-#link = { vic3 = lomwe  } Close relatives to the Makua, currently impossible to map
+#link = { vic3 = lomwe } Close relatives to the Makua, currently impossible to map
 link = { vic3 = makua eu4 = makua }
 link = { vic3 = nguni eu4 = nguni } # South Africa
 link = { vic3 = ovimbundu eu4 = mbundu } # Angola
diff --git a/EU4ToVic3/Data_Files/configurables/religion_map.txt b/EU4ToVic3/Data_Files/configurables/religion_map.txt
index 07de34d9e..80f199d13 100644
--- a/EU4ToVic3/Data_Files/configurables/religion_map.txt
+++ b/EU4ToVic3/Data_Files/configurables/religion_map.txt
@@ -51,11 +51,11 @@ link = { vic3 = masmudi eu4 = masmudi }
 
 # Eastern
 link = { vic3 = confucian eu4 = confucianism }
-link = { vic3 = mahayana eu4 = mahayana }
+link = { vic3 = mahayana eu4 = mahayana eu4 = shinto }
 link = { vic3 = theravada eu4 = buddhism }
 link = { vic3 = sikh eu4 = sikhism }
 link = { vic3 = hindu eu4 = hinduism }
-link = { vic3 = shinto eu4 = shinto }
+#link = { vic3 = shinto eu4 = shinto } Match vanilla setup
 link = { vic3 = gelugpa eu4 = vajrayana }
 
 link = { vic3 = jain eu4 = jain }
@@ -135,4 +135,4 @@ link = { vic3 = heathenry eu4 = germanic_pagan eu4 = anglo_pagan }
 # Yazidism
 link = { vic3 = yazidi eu4 = yazidi }
 link = { vic3 = meshefaresism eu4 = meshefaresism }
-link = { vic3 = kitebacilweism eu4 = kitebacilweism }
\ No newline at end of file
+link = { vic3 = kitebacilweism eu4 = kitebacilweism }