diff --git a/src/common/ai_equipment/vnr_DD_leader.txt b/src/common/ai_equipment/vnr_DD_leader.txt
index 8897995..e42f027 100755
--- a/src/common/ai_equipment/vnr_DD_leader.txt
+++ b/src/common/ai_equipment/vnr_DD_leader.txt
@@ -17,6 +17,7 @@ naval_screen_leader = {
 			not = { has_tech = interwar_ship_hull_light }		# WK-era DD has very low HP, they are not worth producing or refitting
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 500.0
 
@@ -50,6 +51,7 @@ naval_screen_leader = {
 			modifier = { factor = 0.1 has_tech = improved_ship_hull_light }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 600.0
 
@@ -83,6 +85,7 @@ naval_screen_leader = {
 			modifier = { factor = 0.1 has_tech = advanced_ship_hull_light }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 800.0
 
@@ -115,6 +118,7 @@ naval_screen_leader = {
 			modifier = { factor = 25 tag = YUW }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 1000.0
 
diff --git a/src/common/ai_equipment/vnr_battleships.txt b/src/common/ai_equipment/vnr_battleships.txt
index 5b42ab9..20490ff 100755
--- a/src/common/ai_equipment/vnr_battleships.txt
+++ b/src/common/ai_equipment/vnr_battleships.txt
@@ -15,6 +15,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 2000.0
 
@@ -50,6 +51,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 3000.0
 
@@ -85,6 +87,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 3500.0
 
@@ -121,6 +124,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 5000.0
 
@@ -157,6 +161,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 5500.0
 
@@ -194,6 +199,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = yes }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 2500.0
 
@@ -232,6 +238,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = no }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 3000.0
 
@@ -263,6 +270,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = no }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 3500.0
 
@@ -296,6 +304,7 @@ naval_capital_battleship = {
 			modifier = { factor = 0 expert_ai_style = no }
 		}
 
+		is_history = yes
 		target_variant = {
 			match_value = 5000.0
 
diff --git a/src/common/ai_strategy/naval_production.txt b/src/common/ai_strategy/naval_production.txt
index 8772072..fd7db48 100755
--- a/src/common/ai_strategy/naval_production.txt
+++ b/src/common/ai_strategy/naval_production.txt
@@ -754,7 +754,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_submarine
-		value = 80
+		value = 50
 	}
 
 	ai_strategy = {
@@ -772,7 +772,7 @@ naval_unit_role_ratios_ENG_prewar_late = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 70
+		value = 150
 	}
 
 	ai_strategy = {
@@ -818,7 +818,7 @@ naval_unit_role_ratios_ENG_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 50
+		value = 150
 	}
 
 	ai_strategy = {
@@ -1522,7 +1522,7 @@ naval_unit_role_ratios_USA_go_to_war = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 40
+		value = 120
 	}
 
 	ai_strategy = {
@@ -1572,7 +1572,7 @@ naval_unit_role_ratios_USA_atwar = {
 	ai_strategy = {
 		type = role_ratio
 		id = vnr_naval_cruiser_light
-		value = 80
+		value = 150
 	}
 	ai_strategy = {
 		type = role_ratio
diff --git a/src/common/technologies/MTG_naval.txt b/src/common/technologies/MTG_naval.txt
index fa9f46f..1b9fd9e 100755
--- a/src/common/technologies/MTG_naval.txt
+++ b/src/common/technologies/MTG_naval.txt
@@ -760,7 +760,13 @@ technologies = {
 	}
 
 	high_speed_light_engine = {
-		research_cost = 0.6
+		is_special_project_tech = yes
+		allow = {
+			ROOT = {
+				is_special_project_completed = sp:sp_high_speed_light_engine
+			}
+		}
+		research_cost = 0.8
 		enable_equipment_modules = {
 			light_ship_engine_6
 		}
@@ -1698,9 +1704,6 @@ technologies = {
 			ship_armor_cruiser_1
 			ship_armor_cruiser_heavy_1
 		}
-		on_research_complete = {
-			custom_effect_tooltip = cruiser_armor_advice_tt
-		}
 
 		xp_research_type = navy
 		xp_boost_cost = 20
@@ -1741,8 +1744,18 @@ technologies = {
 			ship_armor_cruiser_2
 			ship_armor_cruiser_heavy_2
 		}
+		on_research_complete_limit = {
+			NOT = {
+				has_tech = basic_heavy_armor
+			}
+		}
 		on_research_complete = {
-			custom_effect_tooltip = cruiser_armor_advice_tt
+			custom_effect_tooltip = cruiser_armor_research_tt
+			add_tech_bonus = {
+				bonus = 0.5
+				uses = 1
+				technology = basic_heavy_armor
+			}
 		}
 
 		xp_research_type = navy
@@ -1787,8 +1800,18 @@ technologies = {
 			ship_armor_cruiser_3
 			ship_armor_cruiser_heavy_3
 		}
+		on_research_complete_limit = {
+			NOT = {
+				has_tech = improved_heavy_armor
+			}
+		}
 		on_research_complete = {
-			custom_effect_tooltip = cruiser_armor_advice_tt
+			custom_effect_tooltip = cruiser_armor_research_tt
+			add_tech_bonus = {
+				bonus = 0.5
+				uses = 1
+				technology = improved_heavy_armor
+			}
 		}
 
 		xp_research_type = navy
@@ -1833,8 +1856,18 @@ technologies = {
 			ship_armor_cruiser_4
 			ship_armor_cruiser_heavy_4
 		}
+		on_research_complete_limit = {
+			NOT = {
+				has_tech = advanced_heavy_armor
+			}
+		}
 		on_research_complete = {
-			custom_effect_tooltip = cruiser_armor_advice_tt
+			custom_effect_tooltip = cruiser_armor_research_tt
+			add_tech_bonus = {
+				bonus = 0.5
+				uses = 1
+				technology = advanced_heavy_armor
+			}
 		}
 
 		xp_research_type = navy
@@ -2111,6 +2144,7 @@ technologies = {
 		start_year = 1946
 		enable_equipment_modules = {
 			ship_hull_cruiser_role_cg
+			ship_hull_cruiser_role_cgaa
 		}
 		dependencies = {
 			ship_to_ship_missile = 1
@@ -2912,8 +2946,14 @@ technologies = {
 			ship_armor_bc_2
 		}
 
+		on_research_complete_limit = {
+			NOT = {
+				has_tech = basic_cruiser_armor
+			}
+		}
 		on_research_complete = {
-			custom_effect_tooltip = heavy_armor_advice_tt
+			custom_effect_tooltip = heavy_armor_research_tt
+			set_technology = { basic_cruiser_armor = 1 }
 		}
 
 		xp_research_type = navy
@@ -2953,8 +2993,14 @@ technologies = {
 			ship_armor_bc_3
 		}
 
+		on_research_complete_limit = {
+			NOT = {
+				has_tech = improved_cruiser_armor
+			}
+		}
 		on_research_complete = {
-			custom_effect_tooltip = heavy_armor_advice_tt
+			custom_effect_tooltip = heavy_armor_research_tt
+			set_technology = { improved_cruiser_armor = 1 }
 		}
 
 		start_year = 1936
@@ -2998,8 +3044,14 @@ technologies = {
 			ship_armor_shbb_2
 		}
 
+		on_research_complete_limit = {
+			NOT = {
+				has_tech = advanced_cruiser_armor
+			}
+		}
 		on_research_complete = {
-			custom_effect_tooltip = heavy_armor_advice_tt
+			custom_effect_tooltip = heavy_armor_research_tt
+			set_technology = { advanced_cruiser_armor = 1 }
 		}
 
 		xp_research_type = navy
diff --git a/src/common/technologies/MTG_naval_Support.txt b/src/common/technologies/MTG_naval_Support.txt
index 7213638..b970346 100755
--- a/src/common/technologies/MTG_naval_Support.txt
+++ b/src/common/technologies/MTG_naval_Support.txt
@@ -34,6 +34,7 @@ technologies = {
 			ship_heavy_battery_big_1
 			ship_heavy_battery_small_1
 			ship_secondaries_1
+			ship_secondaries_1_light
 			ship_civilian_light_battery_1
 			ship_anti_air_1_h
 
@@ -176,6 +177,7 @@ technologies = {
 			dp_light_battery_1_single
 			dp_ship_secondaries_1
 			dp_ship_secondaries_1_bb
+			ship_secondaries_2_light
 			ship_anti_air_2_h
 		}