From 2536317502c30cf3150071dd5535b71f5378bfde Mon Sep 17 00:00:00 2001
From: edwardtheelbowhigh
 <73761109+edwardtheelbowhigh@users.noreply.github.com>
Date: Fri, 5 Jun 2026 17:03:38 +0100
Subject: [PATCH] Tidying up some stuff and penciling in men at arms

---
 .../00_late_medieval_innovations.txt          |   6 +-
 .../N3OW_cultural_maa_innovations.txt         |   1 +
 common/men_at_arms_types/00_maa_types.txt     |   9 +-
 common/men_at_arms_types/NEOW_maa_types.txt   | 283 ++++++++++++------
 .../province_terrain/00_province_terrain.txt  |   4 +-
 history/characters/NEOW_e_alps.txt            |   2 +-
 history/characters/NEOW_e_benelux.txt         |   2 +-
 history/characters/NEOW_e_britannia.txt       |  31 +-
 history/characters/NEOW_e_france.txt          |   6 +-
 history/characters/NEOW_e_germania.txt        |   8 +-
 history/characters/NEOW_e_greece.txt          |  14 +-
 history/characters/NEOW_e_hispania.txt        |   3 +-
 history/characters/NEOW_e_italia.txt          |   3 +-
 history/characters/NEOW_e_nistrenia.txt       |   4 +-
 history/characters/NEOW_e_scandinavia.txt     |   2 +-
 history/characters/NEOW_e_zapadoslavia.txt    |   9 +-
 history/provinces/e_alps.txt                  |  24 +-
 history/provinces/e_britannia.txt             |  22 +-
 history/provinces/e_germany.txt               |   4 +-
 history/provinces/e_nistrenia.txt             |   2 +-
 ...EOW_cultural_maa_innovations_l_english.yml |   4 +-
 .../english/replace/titles_l_english.yml      |   4 +-
 22 files changed, 270 insertions(+), 177 deletions(-)

diff --git a/common/culture/innovations/00_late_medieval_innovations.txt b/common/culture/innovations/00_late_medieval_innovations.txt
index 8a578095..a1313c5e 100644
--- a/common/culture/innovations/00_late_medieval_innovations.txt
+++ b/common/culture/innovations/00_late_medieval_innovations.txt
@@ -57,7 +57,8 @@ innovation_gunpowder = {
 	icon = @gunpowder_02
 
 	parameters = {
-		unlock_late_medieval_gunpowder_units = yes
+		unlock_handgunners = yes
+		unlock_bombards = yes
 		unlock_powder_magazines = yes
 	}
 
@@ -72,7 +73,8 @@ innovation_gunpowder = {
 		icon = @fire_dragon
 	}
 
-	custom = unlock_siege_maa_fourth_level
+	#custom = unlock_siege_maa_fourth_level
+	#custom = unlock_handgunners_loc
 
 	flag = global_regular
 	flag = late_medieval_era_regular
diff --git a/common/culture/innovations/N3OW_cultural_maa_innovations.txt b/common/culture/innovations/N3OW_cultural_maa_innovations.txt
index 184921d8..e2aa6e89 100644
--- a/common/culture/innovations/N3OW_cultural_maa_innovations.txt
+++ b/common/culture/innovations/N3OW_cultural_maa_innovations.txt
@@ -24,6 +24,7 @@ innovation_british_arsenals = {
 	
 	parameters = {
 		unlock_powder_magazines = yes
+		unlock_handgunners = yes		
 	}
 	flag = early_medieval_era_regional
 }
diff --git a/common/men_at_arms_types/00_maa_types.txt b/common/men_at_arms_types/00_maa_types.txt
index 73080bd9..a5c6daa8 100644
--- a/common/men_at_arms_types/00_maa_types.txt
+++ b/common/men_at_arms_types/00_maa_types.txt
@@ -578,7 +578,7 @@ bombard = {
 
 	can_recruit = {
 		culture = {
-			has_cultural_parameter = unlock_late_medieval_gunpowder_units
+			has_cultural_parameter = unlock_bombards
 			NOR = {
 				has_cultural_pillar = heritage_chinese
 				has_cultural_pillar = heritage_korean
@@ -615,12 +615,7 @@ handgunners = {
 
 	can_recruit = {
 		gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings	# one powder magazine must be owned to support three handgunner regiments, regardless of maa size
-		culture = {
-			OR = {
-				has_innovation = innovation_british_arsenals
-				has_innovation = innovation_gunpowder
-			}
-		}
+		culture = { has_cultural_parameter = unlock_handgunners }
 	}
 
 	terrain_bonus = {
diff --git a/common/men_at_arms_types/NEOW_maa_types.txt b/common/men_at_arms_types/NEOW_maa_types.txt
index 0affa8d1..e99e9b22 100644
--- a/common/men_at_arms_types/NEOW_maa_types.txt
+++ b/common/men_at_arms_types/NEOW_maa_types.txt
@@ -742,105 +742,21 @@ guides = {
 	icon = light_cavalry
 }
 
-cacadores = {
-
-	type = gunpowder
-
-	damage = 45
-	toughness = 14
-	pursuit = 10
-	screen = 0
-
-	can_recruit = {
-		gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings	# one powder magazine must be owned to support three handgunner regiments, regardless of maa size
-		culture = { has_cultural_parameter = unlock_late_medieval_gunpowder_units }
-		valid_for_maa_trigger = { PARAMETER = unlock_maa_cacadores }
-	}
-
-	terrain_bonus = {
-		forest = { damage = 10 pursuit = 5 }
-		hills = { damage = 5 }
-	}
-
-	counters = {
-		heavy_infantry = 1
-		heavy_cavalry = 1
-		pikemen = 1 
-	}
-
-	buy_cost = { gold = conrois_recruitment_cost }
-	low_maintenance_cost = { gold = conrois_low_maint_cost }
-	high_maintenance_cost = { gold = conrois_high_maint_cost }
-	provision_cost = @provisions_cost_infantry_bankrupting
-
-	ai_quality = {
-		value = counter_synergy_ai_weight_gunpowder
-	}
-
-	stack = 100
-
-	icon = handgonne
-
-}
-
-almogavares = {
-
-	type = skirmishers
-
-	damage = 25
-	toughness = 12
-	pursuit = 20
-	screen = 15
-
-	can_recruit = {
-		valid_for_maa_trigger = { PARAMETER = unlock_maa_almogavares }
-	}
-
-	terrain_bonus = {
-		desert = { damage = 10 }
-		hills = { damage = 5 }
-		mountains = { damage = 5 }
-	}
-
-	counters = {
-		heavy_infantry = 1
-	}
-
-	buy_cost = { gold = skirmisher_recruitment_cost }
-	low_maintenance_cost = { gold = skirmisher_low_maint_cost }
-	high_maintenance_cost = { gold = skirmisher_high_maint_cost }
-	provision_cost = @provisions_cost_infantry_moderate
-
-	ai_quality = {
-		value = culture_ai_weight_skirmishers
-	}
-
-	stack = 100
-
-	icon = skirmishers
-
-}
 
 tercos = {
 	type = pikemen
 
-	damage = 40
-	toughness = 28
-	pursuit = 0
+	damage = 30
+	toughness = 34
+	pursuit = 5
 	screen = 5
 
 	can_recruit = {
-		valid_for_maa_trigger = { PARAMETER = unlock_maa_almogavares }
-	}
-
-	terrain_bonus = {
-		hills = { damage = 5 toughness = 10 }
-		mountains = { damage = 5 toughness = 10 }
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_tercos }
 	}
 
 	counters = {
-		heavy_infantry = 1
-		skrimishers = 1
+
 		light_cavalry = 1
 		heavy_cavalry = 1
 	}
@@ -856,13 +772,50 @@ tercos = {
 
 	stack = 100
 
-	icon = skirmishers
+	icon = pikemen
+}
+
+espadachin = {
+	type = heavy_infantry
+
+	damage = 40
+	toughness = 28
+	pursuit = 10
+	screen = 0
+
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_espadachin }
+	}
+
+	terrain_bonus = {
+		hills = { damage = 5 toughness = 10 }
+		mountains = { damage = 5 toughness = 10 }
+	}
+
+	counters = {
+		heavy_infantry = 1
+		pikemen = 1
+		peasant_militia = 2
+	}
+
+	buy_cost = { gold = skirmisher_recruitment_cost }
+	low_maintenance_cost = { gold = skirmisher_low_maint_cost }
+	high_maintenance_cost = { gold = skirmisher_high_maint_cost }
+	provision_cost = @provisions_cost_infantry_moderate
+
+	ai_quality = {
+		value = culture_ai_weight_skirmishers
+	}
+
+	stack = 100
+
+	icon = heavy_infantry
 }
 
 lanceros  = { 
 	type = heavy_cavalry
 
-	damage = 80
+	damage = 100
 	toughness = 15
 	pursuit = 35
 	screen = 0
@@ -879,13 +832,14 @@ lanceros  = {
 	}
 
 	counters = {
-		archers = 1
-		skirmishers = 1
+		archers = 2
+		skirmishers = 2
+		peasant_militia = 1
 		chemical_weapons = 1
 	}
 
 	can_recruit = {
-		valid_for_maa_trigger = { PARAMETER = unlock_maa_cuirassiers }
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_lanceros}
 	}
 
 	winter_bonus = {
@@ -901,4 +855,145 @@ lanceros  = {
 	stack = 50
 	ai_quality = { value = @[cultural_maa_extra_ai_score + 35 ] }
 	icon = heavy_cavalry
+}
+
+stadswacht = {
+	type = pikemen
+
+	damage = 38
+	toughness = 40
+	pursuit = 0
+	screen = 0
+
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_stadswacht }
+	}
+
+	counters = {
+		heavy_infantry = 1
+		light_cavalry = 1
+		heavy_cavalry = 1
+	}
+
+	buy_cost = { gold = skirmisher_recruitment_cost }
+	low_maintenance_cost = { gold = skirmisher_low_maint_cost }
+	high_maintenance_cost = { gold = skirmisher_high_maint_cost }
+	provision_cost = @provisions_cost_infantry_moderate
+
+	ai_quality = {
+		value = culture_ai_weight_skirmishers
+	}
+
+	stack = 100
+
+	icon = pikemen
+}
+
+blauwegarde = {
+	type = pikemen
+
+	damage = 38
+	toughness = 40
+	pursuit = 0
+	screen = 0
+
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_stadswacht }
+	}
+
+	counters = {
+		heavy_infantry = 1
+		light_cavalry = 1
+		heavy_cavalry = 1
+	}
+
+	buy_cost = { gold = skirmisher_recruitment_cost }
+	low_maintenance_cost = { gold = skirmisher_low_maint_cost }
+	high_maintenance_cost = { gold = skirmisher_high_maint_cost }
+	provision_cost = @provisions_cost_infantry_moderate
+
+	ai_quality = {
+		value = culture_ai_weight_skirmishers
+	}
+
+	stack = 100
+
+	icon = pikemen
+}
+
+rodelansier = {
+	type = heavy_cavalry
+
+	damage = 38
+	toughness = 40
+	pursuit = 0
+	screen = 0
+
+	can_recruit = {
+		valid_for_maa_trigger = { PARAMETER = unlock_maa_rodelansier }
+	}
+
+	counters = {
+		skirmishers = 1
+		chemical_weapons = 1
+		heavy_infantry = 1
+	}
+
+	buy_cost = { gold = skirmisher_recruitment_cost }
+	low_maintenance_cost = { gold = skirmisher_low_maint_cost }
+	high_maintenance_cost = { gold = skirmisher_high_maint_cost }
+	provision_cost = @provisions_cost_infantry_moderate
+
+	ai_quality = {
+		value = culture_ai_weight_skirmishers
+	}
+
+	stack = 100
+
+	icon = pikemen
+}
+
+karabiniers = {
+	type = gun_cavalry
+	
+	damage = 60
+	toughness = 15
+	pursuit = 25
+	screen = 15
+	
+	terrain_bonus = {
+		steppe = { damage = 45 }
+		plains = { damage = 20 }
+		drylands = { damage = 20 }
+		jungle = { damage = -20 pursuit = -20 }
+		wetlands = { damage = -30 pursuit = -30 }
+		mountains = { damage = -30 pursuit = -30 }
+		desert_mountains = { damage = -30 pursuit = -30 }
+	}
+
+	counters = {
+		heavy_infantry = 1
+		chemical_weapons = 1
+		heavy_cavalry = 1
+	}
+
+	can_recruit = {
+		gunpowder_raise_limit_existing_gunpowder_units < gunpowder_raise_limit_existing_gunpowder_buildings	# one powder magazine must be owned to support three handgunner regiments, regardless of maa size
+		culture = { has_cultural_parameter = unlock_maa_karabiniers }
+	}
+
+	buy_cost = { gold = horse_archers_recruitment_cost }
+	low_maintenance_cost = { gold = horse_archers_low_maint_cost }
+	high_maintenance_cost = { gold = horse_archers_high_maint_cost }
+	provision_cost = @provisions_cost_cavalry_cheap
+	
+	stack = 100
+	ai_quality = {
+		value = @cultural_maa_extra_ai_score
+		add = 60 #I mean... they're horse archers
+	}
+	illustration = {
+		reference = horse_gunmen_ill
+	}
+	icon = horse_gunmen
 }
\ No newline at end of file
diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt
index b7225915..31b63581 100644
--- a/common/province_terrain/00_province_terrain.txt
+++ b/common/province_terrain/00_province_terrain.txt
@@ -1364,7 +1364,7 @@ default_coastal_sea=coastal_sea
 1647=forest
 1648=hills
 1649=plains
-1650=forest
+1650=tells
 1651=tells
 1652=plains
 1653=forest
@@ -2015,7 +2015,7 @@ default_coastal_sea=coastal_sea
 2298=mountains
 2299=plains
 2300=forest
-2301=plains
+2301=tells
 2302=hills
 2303=forest
 2304=plains
diff --git a/history/characters/NEOW_e_alps.txt b/history/characters/NEOW_e_alps.txt
index 837ca560..4cb215f3 100644
--- a/history/characters/NEOW_e_alps.txt
+++ b/history/characters/NEOW_e_alps.txt
@@ -44,7 +44,7 @@ alps_jurgen_klosters = {
 	trait = zealous
 	trait = brave
 	trait = wrathful
-	trait = shrewd
+	trait = intellect_good_1
 	trait = holy_warrior
 	father = germany0002
 	2529.1.1 = {
diff --git a/history/characters/NEOW_e_benelux.txt b/history/characters/NEOW_e_benelux.txt
index d7f75671..c1cd922a 100644
--- a/history/characters/NEOW_e_benelux.txt
+++ b/history/characters/NEOW_e_benelux.txt
@@ -530,7 +530,7 @@ benelux_jaan_zolt = { #Saltspite, will give nickname if I knew how to do it
 	trait = vengeful
 	trait = stubborn
 	trait = bastard
-	trait = shrewd
+	trait = intellect_good_1
 	father = benelux_jaan_zolt_1
 	2519.7.2 = {
 		birth = yes
diff --git a/history/characters/NEOW_e_britannia.txt b/history/characters/NEOW_e_britannia.txt
index 3da64ad8..36826a36 100644
--- a/history/characters/NEOW_e_britannia.txt
+++ b/history/characters/NEOW_e_britannia.txt
@@ -6,7 +6,7 @@ britannia_cyflymarhyan_frydyryk = {
 	culture = soueyrneg
 	dna = dna_freddiemercury
 	trait = education_intrigue_4
-	trait = shrewd
+	trait = intellect_good_1
 	#trait = just
 	trait = lustful
 	trait = compassionate
@@ -65,7 +65,7 @@ britannia_cyflymarhyan_pytyr = { #fixed to real char
 	religion = "victorian"
 	culture = soueyrneg
 	trait = education_stewardship_3
-	trait = shrewd
+	trait = intellect_good_1
 	trait = generous
 	trait = calm
 	sexuality = heterosexual
@@ -108,11 +108,10 @@ britannia_cyflymarhyan_symrhathon = { #quicksilver descen
 	religion = "victorian"
 	culture = soueyrneg
 	trait = education_learning_4
-	trait = intellect_good_1
+	trait = intellect_good_2
 	trait = ambitious
 	trait = stubborn
 	trait = arrogant
-	trait = shrewd
 	trait = scarred
 	trait = lifestyle_mystic
 	trait = witch
@@ -184,7 +183,7 @@ britannia_cyflymarhyan_islymo = {
 	religion = "victorian"
 	culture = soueyrneg
 	trait = education_intrigue_2
-	trait = shrewd
+	trait = intellect_good_1
 	trait = content
 	trait = paranoid
 	trait = generous
@@ -203,7 +202,7 @@ britannia_cyflymarhyan_elyan = {
 	religion = "victorian"
 	culture = soueyrneg
 	trait = education_intrigue_1
-	trait = shrewd
+	trait = intellect_good_1
 	trait = deceitful
 	trait = arbitrary
 	trait = stubborn
@@ -281,7 +280,7 @@ britannia_said_barry = {
 	culture = souflander
 	trait = education_diplomacy_3
 	trait = gregarious
-	trait = shrewd
+	trait = intellect_good_1
 	trait = diligent
 	trait = compassionate
 	father = britannia_said_omar 	
@@ -360,7 +359,7 @@ britannia_starr_cwmfwrt = {
 	trait = lifestyle_herbalist
 	trait = eccentric
 	trait = diligent
-	trait = shrewd
+	trait = intellect_good_1
 	trait = cynical
 	father = britannia_starr_kenneth
 	2526.1.1 = {
@@ -1028,8 +1027,7 @@ britannia_solomonid_alfryd = {
 	trait = gregarious
 	trait = ambitious
 	trait = calm
-	trait = intellect_good_2
-	trait = shrewd
+	trait = intellect_good_3
 	#trait = lifestyle_poet
 	#trait = lifestyle_blademaster
 	father = britannia_solomonid_arthur
@@ -1478,7 +1476,7 @@ britannia_dev_eamon = {
 	trait = arrogant
 	trait = stubborn
 	trait = deceitful
-	trait = shrewd
+	trait = intellect_good_1
 	2517.1.1 = {
     	birth = yes
 	}
@@ -1709,7 +1707,7 @@ britannia_stuart_mary = {
 	trait = just
 	trait = compassionate
 	trait = beauty_good_2
-	trait = shrewd
+	trait = intellect_good_1
 	2529.1.1 = {
     	birth = yes
 	}
@@ -2357,8 +2355,7 @@ britannia_cartney_hamish = {
 	trait = diligent
 	trait = ambitious
 	trait = deceitful
-	trait = intellect_good_1
-	trait = shrewd
+	trait = intellect_good_2
 	sexuality = homosexual
 	2520.1.1 = {
     	birth = yes
@@ -2522,7 +2519,7 @@ britannia_adam_duleep = { #Claims to be relative of the last Maharaja, ruler of
 	trait = gregarious
 	trait = just
 	trait = physique_bad_1
-	trait = shrewd
+	trait = intellect_good_1
 	trait = lifestyle_hunter
 	father = britannia_alex_duleep
 	mother = britannia_banda_duleep 
@@ -2761,7 +2758,7 @@ britannia_vyktor_duleep_1 = { #Claims to be relative of the last Maharaja, ruler
 	dna = dna_duleep_vyktor_1
 	culture = prytoneg
 	trait = physique_bad_1
-	trait = shrewd
+	trait = intellect_good_1
 	portrait_override={
 		portrait_modifier_overrides={
 			custom_hair=m_hair_ep3_byzantine_01
@@ -2798,7 +2795,7 @@ britannia_mary_duleep_1 = { #Claims to be relative of the last Maharaja, ruler o
 	religion = "victorian"
 	dna = dna_duleep_mary
 	culture = prytoneg
-	trait = shrewd
+	trait = intellect_good_1
 	2473.3.8 = {
     	birth = yes
 	}
diff --git a/history/characters/NEOW_e_france.txt b/history/characters/NEOW_e_france.txt
index f39ba943..47d631d5 100644
--- a/history/characters/NEOW_e_france.txt
+++ b/history/characters/NEOW_e_france.txt
@@ -290,7 +290,7 @@ france0012 = {
 	trait = strong
 	trait = physique_good_3
 	trait = dwarf
-	trait = shrewd
+	trait = intellect_good_1
 	father = france_gaulle_vitalstatistix
 	2509.1.1 = {
     	birth = yes
@@ -1389,7 +1389,7 @@ france_bookwyrm_raphael={
 	trait = honest
 	trait = ambitious
 	trait = lifestyle_mystic
-	trait = shrewd
+	trait = intellect_good_1
 	trait = lifestyle_gardener
     diplomacy=6
     martial=4
@@ -1542,7 +1542,7 @@ gweltaz_of_brittany={
 	religion=gorsedd
 	trait=lifestyle_poet
 	trait=ambitious
-	trait=shrewd
+	trait=intellect_good_1
 	give_nickname=nick_the_wise
 	2340.4.25={birth=yes}
 	2414.7.19={death=yes}
diff --git a/history/characters/NEOW_e_germania.txt b/history/characters/NEOW_e_germania.txt
index 65b91d76..c3044ce8 100644
--- a/history/characters/NEOW_e_germania.txt
+++ b/history/characters/NEOW_e_germania.txt
@@ -270,7 +270,7 @@ austria10  ={
 	#trait=kinslayer_2
 	trait=brave
 	trait=ambitious
-	trait=shrewd
+	trait=intellect_good_1
 	father=austria08
 	2233.1.13={
 		birth=yes
@@ -1046,7 +1046,7 @@ germany0026 = {
 	religion = "strebenist"
 	culture = NEOW_pomeranian
 	trait = education_learning_4
-	trait = shrewd
+	trait = intellect_good_1
 	trait = honest
 	trait = cynical
 	trait = brave
@@ -2590,7 +2590,7 @@ joschua_iii_of_swabia={
 	trait=sadistic
 	trait=stubborn
 	trait=arrogant
-	trait=shrewd
+	trait=intellect_good_1
 	trait=education_intrigue_4
 	give_nickname=nick_the_wicked
 	2194.12.16={birth=yes}
@@ -3443,7 +3443,7 @@ jurgen_i_of_ravensburg={
 	mother=isabella_weissbronner
 	trait=education_learning_3
 	trait=lifestyle_gardener
-	trait=shrewd
+	trait=intellect_good_1
 	trait=diligent
 	trait=ambitious
 	trait=zealous
diff --git a/history/characters/NEOW_e_greece.txt b/history/characters/NEOW_e_greece.txt
index 3c1a2038..1e3d20ba 100644
--- a/history/characters/NEOW_e_greece.txt
+++ b/history/characters/NEOW_e_greece.txt
@@ -274,8 +274,7 @@ greece0028 = { #
 	religion = "megalocratic"
 	culture = NEOW_peloponnesian
 	trait = education_intrigue_3
-	trait = intellect_good_1
-	trait = shrewd
+	trait = intellect_good_2
 	trait = stubborn
 	trait = deceitful
 	trait = brave
@@ -301,7 +300,7 @@ greece0029 = { #
 	trait = irritable
 	trait = melancholic
 	trait = diligent
-	trait = shrewd
+	trait = intellect_good_1
 	prowess = 12
 	sexuality = bisexual
 	2511.1.1 = {
@@ -324,7 +323,7 @@ greece0030 = { #
 	trait = trusting
 	trait = brave
 	trait = diligent
-	trait = shrewd
+	trait = intellect_good_1
 	sexuality = bisexual
 	father = greece0029
 	2532.1.1 = {
@@ -413,7 +412,6 @@ greece0034 = { #
 	trait = strong
 	trait = intellect_good_3
 	trait = beauty_bad_2
-	trait = shrewd
 	trait = lifestyle_hunter
 	trait = lifestyle_herbalist
 	trait = lifestyle_physician
@@ -570,9 +568,8 @@ greece0041 = { #
 	trait = sadistic
 	trait = lifestyle_mystic
 	trait = irritable
-	trait = shrewd
+	trait = intellect_good_2
 	trait = lifestyle_poet
-	trait = intellect_good_1
 	sexuality = heterosexual
 	give_nickname = nick_the_cyclops
 	trait = beauty_bad_3	
@@ -916,7 +913,7 @@ greece0057 = {
 	trait = generous
 	trait = lustful
 	trait = ambitious
-	trait = shrewd
+	trait = intellect_good_1
 	trait = viking
 	sexuality = heterosexual
 	father = greece0049
@@ -975,7 +972,6 @@ albania0003 = { #Kastriota
 	trait = patient
 	trait = cynical
 	trait = journaller
-	trait = shrewd
 	trait = intellect_good_3
 	martial = 9
 	diplomacy = 7
diff --git a/history/characters/NEOW_e_hispania.txt b/history/characters/NEOW_e_hispania.txt
index 5815a88a..a4b10fd8 100644
--- a/history/characters/NEOW_e_hispania.txt
+++ b/history/characters/NEOW_e_hispania.txt
@@ -36,7 +36,6 @@ hispania0001 = { #Queen of Portugal, who misses her wife
 	trait = depressed_1
 	sexuality = homosexual
 	female = yes
-	give_nickname = nick_the_good
 	2531.1.1 = {
     	birth = yes
 	}
@@ -259,7 +258,7 @@ hispania0007 = {
 	religion = "sevillian"
 	culture = catalan
 	trait = education_diplomacy_4
-	trait = shrewd
+	trait = intellect_good_1
 	trait = just
 	trait = lustful
 	trait = compassionate
diff --git a/history/characters/NEOW_e_italia.txt b/history/characters/NEOW_e_italia.txt
index 986b6168..d42af4c8 100644
--- a/history/characters/NEOW_e_italia.txt
+++ b/history/characters/NEOW_e_italia.txt
@@ -20,9 +20,8 @@ italy0002 = {
 	dynasty = robecchi_bricchetti_dynasty
 	religion = "roman_catholic"
 	culture = venetian
-	trait = intellect_good_2
+	trait = intellect_good_3
 	trait = education_stewardship_2
-	trait = shrewd
 	trait = lustful
 	trait = greedy
 	trait = brave
diff --git a/history/characters/NEOW_e_nistrenia.txt b/history/characters/NEOW_e_nistrenia.txt
index 6264850d..e863e39d 100644
--- a/history/characters/NEOW_e_nistrenia.txt
+++ b/history/characters/NEOW_e_nistrenia.txt
@@ -1279,7 +1279,7 @@ nistria1006 = {
 	trait = brave
 	trait = scarred
 	trait = one_legged
-	trait = shrewd	
+	trait = intellect_good_1	
 	2325.4.6 = {
     	birth = yes
 	}
@@ -1719,7 +1719,7 @@ nistria1029 = {
 	trait = lifestyle_poet
 	trait = diligent
 	trait = ambitious
-	trait = shrewd
+	trait = intellect_good_1
 	trait = cancer
 	give_nickname = nick_the_usurper	
 	father = nistria1030
diff --git a/history/characters/NEOW_e_scandinavia.txt b/history/characters/NEOW_e_scandinavia.txt
index 1a99da55..90f065ab 100644
--- a/history/characters/NEOW_e_scandinavia.txt
+++ b/history/characters/NEOW_e_scandinavia.txt
@@ -28,7 +28,7 @@ scandinavia0002 = {
 	trait = generous
 	trait = humble
 	trait = weak
-	trait = shrewd
+	trait = intellect_good_1
 	2525.1.1 = {
     	birth = yes
 	}
diff --git a/history/characters/NEOW_e_zapadoslavia.txt b/history/characters/NEOW_e_zapadoslavia.txt
index 58767df5..b8444ab4 100644
--- a/history/characters/NEOW_e_zapadoslavia.txt
+++ b/history/characters/NEOW_e_zapadoslavia.txt
@@ -44,9 +44,8 @@ zapadoslavia0002 = { #Daughter of King Dalibor, ruler of Moravia, figure out gla
 	trait = calm
 	trait = diligent
 	trait = ambitious
-	trait = intellect_good_1
+	trait = intellect_good_2
 	trait = beauty_good_3
-	trait = shrewd
 	female = yes
 	father = zapadoslavia0003
 	sexuality = heterosexual
@@ -1657,7 +1656,7 @@ zapadoslavia0077 = {
 	trait = brave
 	trait = education_learning_4
 	trait = scholar
-	trait = shrewd
+	trait = intellect_good_1
 	diplomacy = 7
 	stewardship = 15
 	learning = 12
@@ -1740,7 +1739,7 @@ zapadoslavia0080 = {
 	trait = temperate
 	trait = brave
 	trait = pensive
-	trait = shrewd
+	trait = intellect_good_1
 	trait = journaller
 	trait = physique_bad_1
 	disallow_random_traits = yes
@@ -1813,7 +1812,7 @@ zapadoslavia0083 = {
 	religion = "cadaverist"
 	culture = goral
 	trait = shy
-	trait = shrewd
+	trait = intellect_good_1
 	trait = stubborn
 	trait = education_diplomacy_2
 	trait = gardener
diff --git a/history/provinces/e_alps.txt b/history/provinces/e_alps.txt
index b6108a74..cde1485a 100644
--- a/history/provinces/e_alps.txt
+++ b/history/provinces/e_alps.txt
@@ -15,10 +15,10 @@
 2050 = {
 	culture = swiss
 	religion = helvetic
-	holding = castle_holding
+	holding = church_holding
 }
 9784 = {
-	holding = none
+	holding = castle_holding
 }
 9763 = {
 	holding = none
@@ -44,9 +44,7 @@
 	special_building = capitale_bern_01
 }
 2049 = {
-	culture = swabian
-	religion = helvetic
-	holding = castle_holding
+	holding = city_holding
 }
 2047 = {
 	holding = none
@@ -57,13 +55,13 @@
 	holding = castle_holding
 }
 9782 = {
-	holding = none
+	holding = city_holding
 }
 ###c_geneva
 2035 = {
 	culture = swiss
 	religion = helvetic
-	holding = castle_holding
+	holding = church_holding
 	special_building = palais_des_nations_01
 }
 2037 = {
@@ -76,7 +74,7 @@
 9700 = {
 	culture = patoues
 	religion = helvetic
-	holding = tribal_holding
+	holding = church_holding
 }
 2039 = {
 	holding = none
@@ -84,12 +82,14 @@
 ##d_rhaetia
 ###c_grisons
 2055 = {
-	holding = castle_holding
+	holding = church_holding
 	culture = romansch
 	religion = helvetic
 }
 9704 = {
-	holding = church_holding
+	holding = castle_holding
+	culture = romansch
+	religion = helvetic	
 }
 9786 = {
 	holding = none
@@ -108,7 +108,7 @@
 2053 = {
 	culture = romansch
 	religion = helvetic
-	holding = city_holding
+	holding = church_holding
 }
 2789 = {
 	holding = none
@@ -301,7 +301,7 @@
 2052 = {
 	culture = aleman
 	religion = helvetic
-	holding = tribal_holding
+	holding = castle_holding
 	special_building_slot = generic_university
 }
 
diff --git a/history/provinces/e_britannia.txt b/history/provinces/e_britannia.txt
index 34effe53..aebda874 100644
--- a/history/provinces/e_britannia.txt
+++ b/history/provinces/e_britannia.txt
@@ -16,9 +16,8 @@
 	}
 	1066.1.1 = {
 	buildings = {
-		curtain_walls_01
-		farm_estates_01
-		powder_magazine_01
+	curtain_walls_01
+	powder_magazine_01
 	}
 	}
 	1078.1.1 = {
@@ -43,8 +42,13 @@
 1526 = {
 	holding = city_holding
 	1106.1.1 = {
-	holding = church_holding
+	holding = castle_holding
 	}
+	1266.1.1 = {
+	buildings = {
+	powder_magazine_01
+	}
+	}	
 }
 1512 = {
 	holding = city_holding
@@ -356,7 +360,7 @@
 1581 = {
 	culture = weslander
 	religion = victorian
-	holding = city_holding
+	holding = castle_holding
 	special_building_slot = fortified_port_of_bristol_01
 }
 1577 = {
@@ -891,9 +895,13 @@
 1605 = {
 	culture = prytoneg
 	religion = arcane
-	holding = city_holding
+	holding = castle_holding
+	}
+	1066.1.1 = {
 	buildings = {
+	curtain_walls_01
 	powder_magazine_01
+	}
 	}	
 }
 1603 = {
@@ -917,7 +925,7 @@
 	holding = church_holding
 }
 9724 = {
-	holding = city_holding	
+	holding = city_holding
 }
 9725 = {
 	holding = none
diff --git a/history/provinces/e_germany.txt b/history/provinces/e_germany.txt
index 4b0d96a2..b2694bdf 100644
--- a/history/provinces/e_germany.txt
+++ b/history/provinces/e_germany.txt
@@ -1292,7 +1292,7 @@
 2058 = {
 	culture = elsasse
 	religion = roman_catholic
-	holding = castle_holding
+	holding = city_holding
 }
 2720 = {
 	holding = none
@@ -1341,7 +1341,7 @@
 2732 = {
 	culture = palatine
 	religion = roman_catholic
-	holding = castle_holding
+	holding = church_holding
 }
 2727 = {
 	holding = none
diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt
index 61d939fd..694ba38f 100644
--- a/history/provinces/e_nistrenia.txt
+++ b/history/provinces/e_nistrenia.txt
@@ -882,7 +882,7 @@
 5021 = {	#Soroca
 	culture = moldavian
 	religion = orthodox
-	holding = castle_holding
+	holding = castle_holding	
 }
 5022 = {	#Balti
 	holding = city_holding
diff --git a/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml b/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml
index 4ad25355..772398f6 100644
--- a/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml
+++ b/localization/english/replace/culture/zz_NEOW_cultural_maa_innovations_l_english.yml
@@ -273,4 +273,6 @@
  communal_settlement_1_effect_desc: "$unlocks_building_desc$[peasant_militia|E] [men_at_arms|E] Recruitment Limit: #P +[EmptyScope.ScriptValue('militia_building_limit_bonus_1')|0]#!"
  communal_settlement_2_effect_desc: "$unlocks_building_desc$[peasant_militia|E] [men_at_arms|E] Recruitment Limit: #P +[EmptyScope.ScriptValue('militia_building_limit_bonus_2')|0]#!"
  communal_settlement_3_effect_desc: "$unlocks_building_desc$[peasant_militia|E] [men_at_arms|E] Recruitment Limit: #P +[EmptyScope.ScriptValue('militia_building_limit_bonus_3')|0]#!"
- communal_settlement_4_effect_desc: "$unlocks_building_desc$[peasant_militia|E] [men_at_arms|E] Recruitment Limit: #P +[EmptyScope.ScriptValue('militia_building_limit_bonus_4')|0]#!"
\ No newline at end of file
+ communal_settlement_4_effect_desc: "$unlocks_building_desc$[peasant_militia|E] [men_at_arms|E] Recruitment Limit: #P +[EmptyScope.ScriptValue('militia_building_limit_bonus_4')|0]#!"
+ culture_parameter_unlock_handgunners: "Can recruit [GetMaA('handgunners').GetName] as [men_at_arms|E]"
+ culture_parameter_unlock_bombards: "[GetPlayer.Custom('GetRegionalSiegeLevel4MAA')]" 
\ No newline at end of file
diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml
index 1ffad1e6..ef32c4ad 100644
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@@ -6287,7 +6287,7 @@
  b_farava:0 "Farava"
  b_vaduz:0 "Vaduz"
  b_fareskur:0 "Fareskur"
- b_farfa:0 "Farfa"
+ b_farfa:0 "Segni"
  b_farhajird:0 "Farhajird"
  b_farila:0 "Färila"
  b_farim:0 "Farim"
@@ -11211,7 +11211,7 @@
  b_segarcea:0 "Segarcea"
  b_segeberg:0 "Segeberg"
  b_segezha:0 "Segezha"
- b_segni:0 "Segni"
+ b_segni:0 "Frosinone"
  b_seilanger:0 "Seilanger"
  b_seiniai:0 "Seiniai"
  b_seiyun:0 "Seiyun"