diff --git a/Config/common/operations.cwt b/Config/common/operations.cwt
index 9e6614ae..d4a86f49 100644
--- a/Config/common/operations.cwt
+++ b/Config/common/operations.cwt
@@ -234,14 +234,14 @@ operation = {
 	}
 
 	### Executed when the operation has completed [ once per operation ]
-	## replace_scope = { THIS = country ROOT = country FROM = country FROMFROM = state }
+	## replace_scope = { THIS = operation ROOT = country FROM = country FROMFROM = state }
 	## cardinality = 0..1
 	outcome_execute = {
 		alias_name[effect] = alias_match_left[effect]
 	}
 
 	### Same as outcome_execute
-	## replace_scope = { THIS = country ROOT = country FROM = country FROMFROM = state }
+	## replace_scope = { THIS = operation ROOT = country FROM = country FROMFROM = state }
 	## cardinality = 0..1
 	outcome_extra_execute = {
 		alias_name[effect] = alias_match_left[effect]
diff --git a/Config/common/raids.cwt b/Config/common/raids.cwt
index 79668368..b41546c1 100644
--- a/Config/common/raids.cwt
+++ b/Config/common/raids.cwt
@@ -314,7 +314,7 @@ single_alias[raid_outcome] = {
         alias_name[effect] = alias_match_left[effect]
 
         # And also use the dynamic variables to change scope (see the variable list below)
-        ## push_scope = { country }
+        ## push_scope = country
         ## cardinality = 0..1
 		var:actor_country = {
             ## cardinality = ~1..inf
@@ -330,14 +330,14 @@ single_alias[raid_outcome] = {
         ## cardinality = ~1..inf
         alias_name[effect] = alias_match_left[effect]
 
-        ## push_scope = { country }
+        ## push_scope = country
         ## cardinality = 0..1
         var:victim_country = {
             ## cardinality = ~1..inf
             alias_name[effect] = alias_match_left[effect]
         }
 
-        ## push_scope = { state }
+        ## push_scope = state
         ## cardinality = 0..1
         var:target_state = {
             ## cardinality = ~1..inf
diff --git a/Config/common/traits.cwt b/Config/common/traits.cwt
index 5f1747cf..9c871a96 100644
--- a/Config/common/traits.cwt
+++ b/Config/common/traits.cwt
@@ -131,7 +131,11 @@ unit_leader_trait = {
 		gain_xp = {
 			alias_name[trigger] = alias_match_left[trigger]
 		}
-		## replace_scope = { this = unit_leader root = unit_leader from = country }
+		## replace_scope = { this = unit_leader root = country from = country }
+		gain_xp_leader = {
+			alias_name[trigger] = alias_match_left[trigger]
+		}
+		## replace_scope = { this = operative root = country from = country }
 		gain_xp_leader = {
 			alias_name[trigger] = alias_match_left[trigger]
 		}
diff --git a/Config/effects.cwt b/Config/effects.cwt
index 4f2aef41..9aa61bca 100644
--- a/Config/effects.cwt
+++ b/Config/effects.cwt
@@ -174,6 +174,19 @@ alias[effect:remove_building] = {
 	##cardinality = 0..1
 	province = enum[provinces]
 }
+### Removes specified building in specified state or province.
+## scope = state
+alias[effect:remove_building] = {
+	tag = value[building_tag]
+	tag = {
+		##cardinality = 1..inf
+		value[building_tag]
+	}
+	level = int_variable_field
+
+	##cardinality = 0..1
+	province = enum[provinces]
+}
 
 ### Releases specified country as a free country.
 ## scope = country
@@ -2090,6 +2103,10 @@ alias[effect:damage_building] = {
 ## scope = state
 alias[effect:damage_building] = {
 	tags = value[building_tag]
+	tags = {
+		## cardinality = 1..inf
+		value[building_tag]
+	}
 	damage = variable_field
 	## cardinality = 0..1
 	province = enum[provinces]
diff --git a/Config/effects_bba.cwt b/Config/effects_bba.cwt
index 6a990d5f..20d9dff1 100644
--- a/Config/effects_bba.cwt
+++ b/Config/effects_bba.cwt
@@ -81,6 +81,7 @@ alias[effect:add_random_valid_trait_from_unit] = {
 	character = value[event_target]
 	character = value[global_event_target]
 	character = scope[character]
+	character = scope[unit_leader]
 }
 ## scope = { country character unit_leader }
 alias[effect:set_can_be_fired_in_advisor_role] = {
diff --git a/Config/effects_gtd.cwt b/Config/effects_gtd.cwt
index c8b8abc2..8e00b6f6 100644
--- a/Config/effects_gtd.cwt
+++ b/Config/effects_gtd.cwt
@@ -3,7 +3,8 @@
 alias[effect:add_breakthrough_points] = {
     specialization = <specialization>
     specialization = all
-    value = float
+    value = int
+
 }
 
 ### Requires raid as ROOT scope. Reduce progress to the special project in state. Root scope is raid instance scope. The input value is a ratio of the total needed progress to complete the special project, i.e. a decimal number between 0 and 1.
@@ -378,17 +379,18 @@ alias[effect:raid_damage_units] = {
     damage = float
 	## cardinality = 0..1
     plane_loss = float
+	### Ratio = yes will convert losses to % (so use floats, 1 = 100%), ratio = no instead inflicts flat dmg
     ratio = yes
 }
 ### Damage the units performing the raid in scope (the attackers inflict losses).  Damage is applied to ground units while damage to plane is defined as the amount of planes lost.\nIf 'ratio = yes', then all damage / losses are applied as a fraction of the current amount. For units, damage can be defined through one value 'damage' or separately through 'org_damage' and 'str_damage'
 ## scope = raid
 alias[effect:raid_damage_units] = {
 	## cardinality = 0..1
-    plane_loss = int
+    plane_loss = float
 	## cardinality = 0..1
-    org_damage = int
+    org_damage = float
 	## cardinality = 0..1
-    str_damage = int
+    str_damage = float
 	## cardinality = 0..1
     ratio = no
 }
diff --git a/Config/effects_new.cwt b/Config/effects_new.cwt
index 9453839e..01520e69 100644
--- a/Config/effects_new.cwt
+++ b/Config/effects_new.cwt
@@ -1,13 +1,13 @@
 ###Effect not shown in tooltips
-## scopes = { STATE COUNTRY }
+## scope = { STATE COUNTRY }
 # alias[effect:hidden_effect] = replace_me
 
 ###Grant experience to the scoped in unit leader. Cannot be used to remove experience. The unit leader is promoted to the next skill level if applicable
-## scopes = { UNIT_LEADER }
+## scope = { UNIT_LEADER character }
 alias[effect:gain_xp] = variable_field
 
 ###Delete units of a country. No tooltip is generated.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:delete_unit] = {
 	## error_if_only_match = "template" is replaced with "division_template" in docs, proceed with caution
 	## severity = warning
@@ -26,34 +26,34 @@ alias[effect:delete_unit] = {
 }
 
 ###Free an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:free_operative] = enum[country_tags]
 
 ###Free an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:free_operative] = scope[country]
 
 ###Free an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:free_operative] = value[unit_leader_ids]
 
 ###Free an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:free_operative] = scope[unit_leader]
 
 ###Free an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:free_operative] = {
 	captured_by = enum[country_tags]
 }
 ###Free an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:free_operative] = {
 	captured_by = scope[country]
 }
 
 ###Free a random captured operative of a certain tag by a certain tag. Can be used from a country scope of the operative in question.`all` is optional, default value is no - if set to yes it will free all operatives captured by the target country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:free_random_operative] = {
 	captured_by = enum[country_tags]
 	captured_by = scope[country]
@@ -62,7 +62,7 @@ alias[effect:free_random_operative] = {
 }
 
 ###Create operative for country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:create_operative_leader] = {
 	## cardinality = 0..1
 	name = scalar
@@ -109,11 +109,11 @@ alias[effect:create_operative_leader] = {
 }
 
 ###Capture an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:capture_operative] = scope[operative]
 
 ###Capture an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:capture_operative] = {
 	operative = scope[operative]
 	## cardinality = 0..1
@@ -121,7 +121,7 @@ alias[effect:capture_operative] = {
 }
 
 ###Capture an operative. Can be used from a scope and a target that is either a country or a unit leader.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:capture_operative] = {
 	captured_by = scope[country]
 	captured_by = enum[country_tags]
@@ -130,7 +130,7 @@ alias[effect:capture_operative] = {
 }
 
 ###Executes children effects on a random operatives that fulfils the "limit" trigger.
-## scopes = { COUNTRY OPERATION }
+## scope = { COUNTRY OPERATION }
 ## push_scope = operative
 alias[effect:random_operative] = {
     ## cardinality = 0..1
@@ -142,7 +142,7 @@ alias[effect:random_operative] = {
 
 
 ###Executes children effects on operatives that fulfils the "limit" trigger. tooltip=key can be added to override tooltip title
-## scopes = { COUNTRY OPERATION }
+## scope = { COUNTRY OPERATION }
 ## push_scope = operative
 alias[effect:every_operative] = {
 	### Apply the effect to this number of randomly selected entities
@@ -159,7 +159,7 @@ alias[effect:every_operative] = {
 
 
 ###Sends to target scope specified fraction of equipment.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:send_equipment_fraction] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -167,7 +167,7 @@ alias[effect:send_equipment_fraction] = {
 }
 
 ###Transfer units (air, army, navy) to another country. Also transfer the stockpiled equipment (you can set it to zero if it is undesired) as well as unit leaders.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:transfer_units_fraction] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -198,61 +198,61 @@ alias[effect:transfer_units_fraction] = {
 }
 
 ###Removes a ideology leader as leader of his party, making the next in line the new party leader.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:kill_ideology_leader] = <ideology>
 
 ###Removes a ideology leader as leader of his party, making the next in line the new party leader.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:kill_ideology_leader] = variable_field
 
 ###Adds/removes days to 'days_remove' value of a decision.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_days_remove] = {
 	decision = <decision.timed>
 	days = int_variable_field
 }
 
 ###Add days to 'mission_timeout' value of a mission.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_days_mission_timeout] = {
 	mission = <decision.mission>
 	days = int_variable_field
 }
 
 ###Add resistance to a state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:add_resistance] = variable_field
 
 ###Add compliance to a state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:add_compliance] = variable_field
 
 ###Starts resistance activity for a core country. Use along with force_enable_resistance if you are enabling resistance in a state that is not possible (ie core).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:start_resistance] = enum[country_tags]
 
 ###Starts resistance activity for a core country. Use along with force_enable_resistance if you are enabling resistance in a state that is not possible (ie core).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:start_resistance] = scope[country]
 
 ###Starts resistance activity for a core country. Use along with force_enable_resistance if you are enabling resistance in a state that is not possible (ie core).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:start_resistance] = bool
 
 ###Cancels resistance activity for a core country. Use along with force_disable_resistance to disable resistance forever.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:cancel_resistance] = bool
 
 ###Set resistance of a state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:set_resistance] = variable_field
 
 ###Set compliance of a state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:set_compliance] = variable_field
 
 ###Adds a specific token against against another country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_operation_token] = {
 	tag = scope[country]
 	tag = enum[country_tags]
@@ -260,7 +260,7 @@ alias[effect:add_operation_token] = {
 }
 
 ###Remove a specific token against against another country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:remove_operation_token] = {
 	tag = scope[country]
 	tag = enum[country_tags]
@@ -268,7 +268,7 @@ alias[effect:remove_operation_token] = {
 }
 
 ###Adds a random limited use tech bonus from country of categories that is it ahead in compared to you. It must have at least one category or folder. But it can contain any number of them in any combination. Note: if a country does not have a tech to be stolen a random tech bonus will be applied based on base_bonus.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:steal_random_tech_bonus] = {
 	## cardinality = 0..inf
 	folder = enum[tech_folder]
@@ -293,7 +293,7 @@ alias[effect:steal_random_tech_bonus] = {
 }
 
 ###Teleport armies in state to another state or province.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:teleport_armies] = {
 	## cardinality = 0..1
 	## replace_scope = { this = country }
@@ -305,7 +305,7 @@ alias[effect:teleport_armies] = {
 }
 
 ###Teleport armies in state to another state or province.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:teleport_armies] = {
 	## cardinality = 0..1
 	## replace_scope = { this = country }
@@ -317,7 +317,7 @@ alias[effect:teleport_armies] = {
 }
 
 ###Teleport armies in state to another state or province.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:teleport_armies] = {
 	## cardinality = 0..1
 	## replace_scope = { this = country }
@@ -329,7 +329,7 @@ alias[effect:teleport_armies] = {
 }
 
 ###Teleport armies in state to another state or province.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:teleport_armies] = {
 	## cardinality = 0..1
 	## replace_scope = { this = country }
@@ -339,7 +339,7 @@ alias[effect:teleport_armies] = {
 }
 
 ###Executes children effects on every controlled state that fulfils the "limit" trigger. tooltip=key can be added to override tooltip title.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = state
 alias[effect:every_controlled_state] = {
 	### Apply the effect to this number of randomly selected entities
@@ -358,7 +358,7 @@ alias[effect:every_controlled_state] = {
 
 
 ###Sets the controller of provinces belong to a state and fulfils a condition. No tooltip is built.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:set_state_province_controller] = {
 	controller = enum[country_tags]
 	controller = scope[country]
@@ -370,11 +370,11 @@ alias[effect:set_state_province_controller] = {
 }
 
 ###Reserves a dynamic country so it won't be recycled for civil wars. A dynamic country with no owned states must be reserved after it is created and unreserved once it is no longer going to be used.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:reserve_dynamic_country] = bool
 
 ###Calculates the highest scored country that is defined in a country scorer and sets it to a variable.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:get_highest_scored_country_temp] = {
 	scorer = <country_scorer>
 	## cardinality = 0..1
@@ -382,7 +382,7 @@ alias[effect:get_highest_scored_country_temp] = {
 }
 
 ###Creates a dynamic country and runs child effects on it.
-## scopes = { any }
+## scope = { any }
 ## push_scope = country
 alias[effect:create_dynamic_country] = {
 	original_tag = enum[country_tags]
@@ -395,7 +395,7 @@ alias[effect:create_dynamic_country] = {
 }
 
 ###Calculates & sorts all countries in a country scorer and stores them and their scores in temp arrays.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:get_sorted_scored_countries_temp] = {
 	scorer = <country_scorer>
 	## cardinality = 0..1
@@ -405,7 +405,7 @@ alias[effect:get_sorted_scored_countries_temp] = {
 }
 
 ###Executes children effects on random occupied country that fulfils the "limit" trigger.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[effect:random_occupied_country] = {
     ## cardinality = 0..1
@@ -417,7 +417,7 @@ alias[effect:random_occupied_country] = {
 
 
 ###Executes children effects on every occupied country that fulfils the "limit" trigger. tooltip=key can be defined to override tooltip title.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[effect:every_occupied_country] = {
 	### Apply the effect to this number of randomly selected entities
@@ -436,10 +436,10 @@ alias[effect:every_occupied_country] = {
 
 
 ###Adds resistance target to the scoped state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:add_resistance_target] = variable_field
 ###Adds resistance target to the scoped state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:add_resistance_target] = {
 	amount = variable_field
 	## cardinality = ~0..1
@@ -459,11 +459,11 @@ alias[effect:add_resistance_target] = {
 }
 
 ###Removes a previously added resistance target using its id. No tooltips are generated.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:remove_resistance_target] = value[resistance_target]
 
 ###Calculates the highest scored country that is defined in a country scorer and sets it to a temp variable.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:get_highest_scored_country] = {
 	scorer = <country_scorer>
 	## cardinality = 0..1
@@ -471,7 +471,7 @@ alias[effect:get_highest_scored_country] = {
 }
 
 ###Calculates & sorts all countries in a country scorer and stores them and their scores in arrays.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:get_sorted_scored_countries] = {
 	scorer = <country_scorer>
 	## cardinality = 0..1
@@ -481,7 +481,7 @@ alias[effect:get_sorted_scored_countries] = {
 }
 
 ###Executes children effects on a random country with original tag.
-## scopes = { any }
+## scope = { any }
 ## push_scope = country
 alias[effect:random_country_with_original_tag] = {
 	original_tag_to_check = enum[country_tags]
@@ -496,7 +496,7 @@ alias[effect:random_country_with_original_tag] = {
 ### random_country_division - Executes children effects on a random division that fulfill the "limit" trigger. tooltip=key can be added to override tooltip title
 ### Supported scopes: country
 ### Executes children effects on a random division that full the "limit" trigger. tooltip=key can be added to override to override tooltip title
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = unit
 alias[effect:random_country_division] = {
 	## cardinality = 0..1
@@ -508,7 +508,7 @@ alias[effect:random_country_division] = {
 
 
 ###Executes children effects on a all countries with original tag. tooltip=key can be defined to override tooltip title.
-## scopes = { any }
+## scope = { any }
 ## push_scope = country
 alias[effect:every_country_with_original_tag] = {
 	### Apply the effect to this number of randomly selected entities
@@ -527,7 +527,7 @@ alias[effect:every_country_with_original_tag] = {
 
 
 ###Add decryption against a target country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_decryption] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -536,7 +536,7 @@ alias[effect:add_decryption] = {
 }
 
 ###Add decryption against a target country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_decryption] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -546,7 +546,7 @@ alias[effect:add_decryption] = {
 
 
 ###Deletes units that uses a specific template.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:delete_units] = {
 	division_template = scalar
 	## cardinality = 0..1
@@ -554,15 +554,15 @@ alias[effect:delete_units] = {
 }
 
 ###Force enables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_enable_resistance] = scope[country]
 
 ###Force enables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_enable_resistance] = enum[country_tags]
 
 ###Force enables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_enable_resistance] = {
 	## cardinality = 0..1
 	clear = bool
@@ -575,7 +575,7 @@ alias[effect:force_enable_resistance] = {
 }
 
 ###Force enables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_enable_resistance] = {
 	## cardinality = 0..1
 	clear = bool
@@ -588,19 +588,19 @@ alias[effect:force_enable_resistance] = {
 }
 
 ###Force disables resistance for scoped state
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_disable_resistance] = bool
 
 ###Force disables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_disable_resistance] = scope[country]
 
 ###Force disables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_disable_resistance] = enum[country_tags]
 
 ###Force disables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_disable_resistance] = {
 	## cardinality = 0..1
 	clear = bool
@@ -613,7 +613,7 @@ alias[effect:force_disable_resistance] = {
 }
 
 ###Force disables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_disable_resistance] = {
 	## cardinality = 0..1
 	clear = bool
@@ -626,7 +626,7 @@ alias[effect:force_disable_resistance] = {
 }
 
 ###Force disables resistance for scoped state. The resistance will be active even if other conditions doesn't satisfy (even if it is core or resistance check trigger is false).
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:force_disable_resistance] = {
 	clear = yes
 	## error_if_only_match = This has no effect
@@ -644,22 +644,22 @@ alias[effect:force_disable_resistance] = {
 }
 
 ###Create an Intelligence Agency for the country, if it is not already done.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:create_intelligence_agency] = yes
 
 ###Create an Intelligence Agency for the country, if it is not already done.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:create_intelligence_agency] = {
   name = localisation
   icon = <spriteType>
 }
 
 ###Add an upgrade to the Intelligence Agency (must be created).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:upgrade_intelligence_agency] = <intelligence_agency_upgrade>
 
 ###Create a ship from another country and assign it to the reserve fleet. 'creator' is optional. If not set, it will be the scoped country. 'name' is optional.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:create_ship] = {
 	type = <equipment.naval_equip>
 	equipment_variant = scalar
@@ -672,33 +672,33 @@ alias[effect:create_ship] = {
 }
 
 ###Set current country as spy master of its faction.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:set_faction_spymaster] = bool
 
 ###Lock all the division template at the country level. Note that you need to unlock them in the same way (You can't use 'set_division_template_lock' individually, because the lock at the country level will not be removed).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:country_lock_all_division_template] = bool
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = value_set[variable]
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = value_set[variable]
 	distribution = uniform
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = value_set[variable]
 	distribution = binomial
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = value_set[variable]
 	distribution = uniform
@@ -707,7 +707,7 @@ alias[effect:randomize_temp_variable] = {
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = value_set[variable]
 	distribution = binomial
@@ -716,7 +716,7 @@ alias[effect:randomize_temp_variable] = {
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = value_set[variable]
 	distribution = binomial
@@ -726,25 +726,25 @@ alias[effect:randomize_temp_variable] = {
 }
 
 ###Randomize a variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_variable] = variable_field_32
 
 ###Randomize a variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_variable] = {
 	var = variable_field_32
 	distribution = uniform
 }
 
 ###Randomize a variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_variable] = {
 	var = variable_field_32
 	distribution = binomial
 }
 
 ###Randomize a variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_variable] = {
 	var = variable_field_32
 	distribution = uniform
@@ -753,7 +753,7 @@ alias[effect:randomize_variable] = {
 }
 
 ###Randomize a variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_variable] = {
 	var = variable_field_32
 	distribution = binomial
@@ -762,7 +762,7 @@ alias[effect:randomize_variable] = {
 }
 
 ###Randomize a variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_variable] = {
 	var = variable_field_32
 	distribution = binomial
@@ -772,18 +772,18 @@ alias[effect:randomize_variable] = {
 }
 
 ###Harm an operative. The specified value is subject to modifiers.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:harm_operative_leader] = variable_field
 
 ###Force an operative into hiding, preventing them from performing mission. The specified values is subject to modifiers.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:force_operative_leader_into_hiding] = bool
 ###Force an operative into hiding, preventing them from performing mission. The specified values is subject to modifiers.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:force_operative_leader_into_hiding] = int[0..100]
 
 ###Add the specified amount of intel over a specified country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_intel] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -798,7 +798,7 @@ alias[effect:add_intel] = {
   }
 
 ###Fires a operative leader event for owner country.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:operative_leader_event] = {
 	### The event to fire.
 	id = <event.operative_leader_event>
@@ -877,24 +877,24 @@ alias[effect:operative_leader_event] = {
 }
 
 ###Kills an operative. This will temporarily lock the slot they occupy.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:kill_operative] = scope[operative]
 
 ###Kills an operative. This will temporarily lock the slot they occupy.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:kill_operative] = {
 	operative = scope[operative]
 }
 
 ###Kills an operative. This will temporarily lock the slot they occupy.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:kill_operative] = {
 	killed_by = scope[country]
 	killed_by = enum[country_tags]
 }
 
 ###Executes children effects on random controlled state that fulfils the "limit" trigger. prioritize = { <stateID> <stateID> } to pick those states first if they fulfil the limit.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = state
 alias[effect:random_controlled_state] = {
 	## cardinality = 0..1
@@ -911,45 +911,45 @@ alias[effect:random_controlled_state] = {
 
 
 ###Forces the refresh of the tree layout for the scoped country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:mark_focus_tree_layout_dirty] = yes
 
 ###Adds a civil war target to a specific country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_civil_war_target] = scope[country]
 
 ###Adds a civil war target to a specific country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_civil_war_target] = enum[country_tags]
 
 ###Modulos a temp variable with another.
-## scopes = { any }
+## scope = { any }
 alias[effect:modulo_temp_variable] = {
 	value_set[variable] = variable_field_32
 }
 
 ###mMdulos a temp variable with another.
-## scopes = { any }
+## scope = { any }
 alias[effect:modulo_temp_variable] = {
 	var = value_set[variable]
 	value = variable_field_32
 }
 
 ###Modulos a variable with another.
-## scopes = { any }
+## scope = { any }
 alias[effect:modulo_variable] = {
 	value_set[variable] = variable_field_32
 }
 
 ###Modulos a variable with another.
-## scopes = { any }
+## scope = { any }
 alias[effect:modulo_variable] = {
 	var = value_set[variable]
 	value = variable_field_32
 }
 
 ###Adds the collaboration in a target country with our currently scoped country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:add_collaboration] = {
 	target = scope[country]
 	target = enum[country_tags]
@@ -957,7 +957,7 @@ alias[effect:add_collaboration] = {
 }
 
 ###Sets the collaboration in a target country with our currently scoped country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:set_collaboration] = {
 	target = scope[country]
 	target = enum[country_tags]
@@ -965,46 +965,46 @@ alias[effect:set_collaboration] = {
 }
 
 ###Special effect for executing the Coordinated Strike Operation. Amount determines how often the simulation is run.
-## scopes = { OPERATION }
+## scope = { OPERATION }
 alias[effect:execute_operation_coordinated_strike] = {
 	amount = int
 }
 
 ###Add the specified nationality to the scoped-in operative.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:add_nationality] = scope[country]
 
 ###Add the specified nationality to the scoped-in operative.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:add_nationality] = enum[country_tags]
 
 ###The scoped in country recall the volunteers sent to the target country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:recall_volunteers_from] = scope[country]
 
 ###The scoped in country recall the volunteers sent to the target country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:recall_volunteers_from] = enum[country_tags]
 
 ###An operative is turned by the specified country. This transfers the operative to the target country and make it appear as killed to the country of origin (increases the death counter and lock the slot). This fires the on_action on_operative_death with as killer the target country. If the target country is the owner of the operative, this has no effect and an error is logged. WARN: the on_action might execute immediately, before any effect listed after the occurrence of turn_operative.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:turn_operative] = scope[operative]
 
 ###An operative is turned by the specified country. This transfers the operative to the target country and make it appear as killed to the country of origin (increases the death counter and lock the slot). This fires the on_action on_operative_death with as killer the target country. If the target country is the owner of the operative, this has no effect and an error is logged. WARN: the on_action might execute immediately, before any effect listed after the occurrence of turn_operative.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[effect:turn_operative] = {
 	operative = scope[operative]
 }
 
 ###An operative is turned by the specified country. This transfers the operative to the target country and make it appear as killed to the country of origin (increases the death counter and lock the slot). This fires the on_action on_operative_death with as killer the target country. If the target country is the owner of the operative, this has no effect and an error is logged. WARN: the on_action might execute immediately, before any effect listed after the occurrence of turn_operative.
-## scopes = { operative }
+## scope = { operative }
 alias[effect:turn_operative] = {
 	turned_by = scope[country]
 	turned_by = enum[country_tags]
 }
 
 ###Set initial garrison strength.
-## scopes = { STATE }
+## scope = { STATE }
 alias[effect:set_garrison_strength] = variable_field
 
 ###Releases specified country as a puppet using your owned or controlled states.
@@ -1074,11 +1074,11 @@ alias[effect:set_leader_portrait] = <spriteType>
 alias[effect:set_leader_description] = localisation
 
 ###Sets a variable to a random value.
-## scopes = { any }
+## scope = { any }
 alias[effect:set_variable_to_random] = value_set[variable]
 
 ###Sets a variable to a random value.
-## scopes = { any }
+## scope = { any }
 alias[effect:set_variable_to_random] = {
 	var = value_set[variable]
 	## cardinality = 0..1
@@ -1090,11 +1090,11 @@ alias[effect:set_variable_to_random] = {
 }
 
 ###Sets a temp variable to a random value.
-## scopes = { any }
+## scope = { any }
 alias[effect:set_temp_variable_to_random] = value_set[variable]
 
 ###Sets a temp variable to a random value.
-## scopes = { any }
+## scope = { any }
 alias[effect:set_temp_variable_to_random] = {
 	var = value_set[variable]
 	## cardinality = 0..1
@@ -1106,21 +1106,21 @@ alias[effect:set_temp_variable_to_random] = {
 }
 
 ###Adds victory point to province.
-## scopes = { any }
+## scope = { any }
 alias[effect:add_victory_points] = {
 	province = enum[provinces]
 	value = variable_field_32
 }
 
 ###Sets victory point to province.
-## scopes = { any }
+## scope = { any }
 alias[effect:set_victory_points] = {
 	province = enum[provinces]
 	value = variable_field_32
 }
 
 ###Removes wargoals of specified type for country in scope.
-## scopes = { country }
+## scope = { country }
 alias[effect:remove_wargoal] = {
 	target = scope[country]
 	target = enum[country_tags]
@@ -1129,7 +1129,7 @@ alias[effect:remove_wargoal] = {
 }
 
 ### Start peace conference
-## scopes = { country }
+## scope = { country }
 alias[effect:start_peace_conference] = {
 	tag = scope[country]
 	tag = enum[country_tags]
@@ -1153,29 +1153,29 @@ alias[effect:set_occupation_law_where_available] = default_law
 alias[effect:set_occupation_law_where_available] = <occupation_law>
 
 ### Sets specific occupation law where available
-## scopes = { state }
+## scope = { state }
 alias[effect:set_occupation_law] = <occupation_law>
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = variable_field
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = variable_field_32
 	distribution = uniform
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = variable_field_32
 	distribution = binomial
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = variable_field_32
 	distribution = uniform
@@ -1184,7 +1184,7 @@ alias[effect:randomize_temp_variable] = {
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = variable_field_32
 	distribution = binomial
@@ -1193,7 +1193,7 @@ alias[effect:randomize_temp_variable] = {
 }
 
 ###Randomize a temporary variable.
-## scopes = { any }
+## scope = { any }
 alias[effect:randomize_temp_variable] = {
 	var = variable_field_32
 	distribution = binomial
@@ -1203,5 +1203,5 @@ alias[effect:randomize_temp_variable] = {
 }
 
 ###Add divisional commander xp to unit
-## scopes = { any }
+## scope = { any }
 alias[effect:add_divisional_commander_xp] = int
\ No newline at end of file
diff --git a/Config/effects_nsb.cwt b/Config/effects_nsb.cwt
index 750d491b..bd07bccb 100644
--- a/Config/effects_nsb.cwt
+++ b/Config/effects_nsb.cwt
@@ -488,6 +488,7 @@ alias[effect:promote_character] = value[character_token]
 alias[effect:promote_character] = {
 	character = <character>
 	character = value[character_token]
+	character = country_leader
 	### must match the character's country leader sub-ideology
 	ideology = enum[sub_ideology]
 	ideology = <ideology>
@@ -641,7 +642,7 @@ alias[effect:set_nationality] = {
 alias[effect:set_nationality] = enum[country_tags]
 
 ### Executes children effects on every subject country that fulfills the "limit" trigger. tooltip=key can be defined to override tooltip title
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[effect:every_subject_country] = {
 	### Apply the effect to this number of randomly selected entities
@@ -659,7 +660,7 @@ alias[effect:every_subject_country] = {
 }
 
 ### Executes child effects on random subject country that fulfills the limit.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[effect:random_subject_country] = {
     ## cardinality = 0..1
@@ -671,7 +672,7 @@ alias[effect:random_subject_country] = {
 
 
 ### Executes children effects on every country that fulfils the "limit" trigger. Difference with every_country is that it includes countries not yet present on the map. tooltip=key can be defined to override tooltip title.
-## scopes = { COUNTRY }
+## scope = { any }
 ## push_scope = country
 alias[effect:every_possible_country] = {
 	### Apply the effect to this number of randomly selected entities
@@ -689,7 +690,7 @@ alias[effect:every_possible_country] = {
 }
 
 ### Display in tooltip every character that fulfils the "limit" trigger.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = character
 alias[effect:character_list_tooltip] = {
     ## cardinality = 0..1
@@ -807,7 +808,7 @@ alias[effect:create_railway_gun] = {
 }
 
 ### Generate character
-## scopes = { country }
+## scope = { country }
 alias[effect:generate_character] = {
 	token_base = value_set[character_token]
 	## cardinality = 0..1
diff --git a/Config/on_actions.cwt b/Config/on_actions.cwt
index a802f541..504fed3c 100644
--- a/Config/on_actions.cwt
+++ b/Config/on_actions.cwt
@@ -1021,7 +1021,7 @@ on_action = {
 
 	### Trigger the following commands whenever an operative completed. THIS - the operative, ROOT - the initiating country, FROM - the target country.
 	## cardinality = 0..inf
-	## replace_scope = { THIS = operative ROOT = country FROM = country }
+	## replace_scope = { THIS = operation ROOT = country FROM = country }
 	on_operation_completed = single_alias_right[operative_event_effect]
 
 	### Trigger the following commands whenever an operative dies.
@@ -1120,7 +1120,7 @@ on_action = {
 	on_mio_industrial_manufacturer_unassigned = single_alias_right[on_action_effect]
 
 	### Triggered when a project is completed
-	### ROOT is the Military Industrial Organization, FROM is the owner of the MIO country
+	### ROOT is the owner of the special project, FROM is the special project
 	## cardinality = 0..inf
 	## replace_scope = { ROOT = COUNTRY this = COUNTRY FROM = special_project }
 	on_project_completion = single_alias_right[on_action_effect]
diff --git a/Config/triggers_gtd.cwt b/Config/triggers_gtd.cwt
index 49b62707..85773bb7 100644
--- a/Config/triggers_gtd.cwt
+++ b/Config/triggers_gtd.cwt
@@ -199,10 +199,10 @@ alias[trigger:has_unit_type] = <unit>
 alias[trigger:province_vp] = int
 
 ### Check if country has shine effect on focus (either manually achieved or by being worked on).
-### scope = country
+## scope = country
 alias[trigger:has_shine_effect_on_focus] = <focus>
 ### Check if country has shine effect on focus (either manually achieved or by being worked on).
-### scope = country
+## scope = country
 alias[trigger:has_shine_effect_on_focus] = <shared_focus>
 
 alias[trigger:custom_override_tooltip] = {
diff --git a/Config/triggers_new.cwt b/Config/triggers_new.cwt
index c29f76e3..6ffde3e6 100644
--- a/Config/triggers_new.cwt
+++ b/Config/triggers_new.cwt
@@ -1,92 +1,92 @@
 ###All inside trigger must be true.
-## scopes = { any }
+## scope = { any }
 # alias[trigger:and] = replace_me
 
 ###At least one entry inside trigger must be true.
-## scopes = { any }
+## scope = { any }
 # alias[trigger:or] = replace_me
 
 ###Negates content of trigger.
-## scopes = { any }
+## scope = { any }
 # alias[trigger:not] = replace_me
 
 ###Print message to game.log - Can be localized.
-## scopes = { any }
+## scope = { any }
 alias[trigger:log] = localisation_inline
 
 ###Checks if scoped unit leader, ace or country is female.
-## scopes = { COUNTRY UNIT_LEADER ACE }
+## scope = { COUNTRY UNIT_LEADER CHARACTER }
 alias[trigger:is_female] = bool
 
 ###Compares the current resistance level of a state to a value.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:resistance] = variable_field
 
 ###Checks if a country has a captured an operative (supports scoped variables).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_captured_operative] = scope[country]
 
 ###Checks if a country has a captured an operative (supports scoped variables).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_captured_operative] = enum[country_tags]
 
 ###Checks if a country has a captured an operative (supports scoped variables).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_captured_operative] = bool
 
 ###Check if a state has enough non damaged buildings.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:non_damaged_building_level] = {
 	building = <building>
 	level = variable_field
 }
 
 ###Checks the number of days since the country last capitulated, even if it is no longer capitulated. If it has not ever capitulated, the value is extremely large. It is recommended to combine this with has_capitulated = yes when you specifically want to ignore non-active capitulations.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:days_since_capitulated] = variable_field
 
 ###Compares the current compliance level of a state to a value.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:compliance] = variable_field
 
 ###Compares the current compliance speed of a state to a value.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:compliance_speed] = variable_field
 
 ###Compares the current resistance speed of a state to a value.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:resistance_speed] = variable_field
 
 ###Compares occupied country that creates resistance to a tag.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:occupied_country_tag] = enum[country_tags]
 
 ###Compares occupied country that creates resistance to a tag.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:occupied_country_tag] = scope[country]
 
 ###Compares the target resistance level of a state to a value.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:resistance_target] = variable_field
 
 ###Returns true if state has a resistance.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:has_resistance] = bool
 
 ###Returns true if state has an active resistance (above zero).
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:has_active_resistance] = bool
 
 ###Compares occupied country that creates resistance to a tag.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:has_occupation_modifier] = <resistance_compliance_modifier>
 
 ###Returns true if game is in debug mode (launched with -debug argument).
-## scopes = { any }
+## scope = { any }
 alias[trigger:is_debug] = bool
 
 ###Compares the core (average of all occupied states) compliance value of occupied_country_tag that is occupied by the country in current scope.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:core_compliance] = {
 	occupied_country_tag = enum[country_tags]
 	occupied_country_tag = scope[country]
@@ -94,7 +94,7 @@ alias[trigger:core_compliance] = {
 }
 
 ###Compares the core (average of all occupied states) resistance value of occupied_country_tag that is occupied by the country in current scope.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:core_resistance] = {
 	occupied_country_tag = enum[country_tags]
 	occupied_country_tag = scope[country]
@@ -102,7 +102,7 @@ alias[trigger:core_resistance] = {
 }
 
 ###Checks network strength you have in a country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:network_strength] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -114,7 +114,7 @@ alias[trigger:network_strength] = {
 }
 
 ###Checks network strength you have in a country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:network_strength] = {
 	state = <state>
 	state = scope[state]
@@ -122,7 +122,7 @@ alias[trigger:network_strength] = {
 }
 
 ###Checks if a country has a specific token against another country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_operation_token] = {
 	tag = scope[country]
 	tag = enum[country_tags]
@@ -130,19 +130,19 @@ alias[trigger:has_operation_token] = {
 }
 
 ###Checks occupation law of state.
-## scopes = { STATE }
+## scope = { STATE }
 alias[trigger:occupation_law] = <occupation_law>
 
 ###Checks if a country is ally with another country. Will check if two countries are same/in same faction/has subject master relation.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_ally_with] = scope[country]
 
 ###Checks if a country is ally with another country. Will check if two countries are same/in same faction/has subject master relation.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_ally_with] = enum[country_tags]
 
 ###Calculates the highest scored country that is defined in a country scorer and sets it to a variable.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:get_highest_scored_country_temp] = {
 	scorer = <country_scorer>
 	## cardinality = 0..1
@@ -150,7 +150,7 @@ alias[trigger:get_highest_scored_country_temp] = {
 }
 
 ###Calculates & sorts all countries in a country scorer and stores them and their scores in temp arrays.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:get_sorted_scored_countries_temp] = {
 	scorer = <country_scorer>
 	## cardinality = 0..1
@@ -160,7 +160,7 @@ alias[trigger:get_sorted_scored_countries_temp] = {
 }
 
 ###Checks decryption ratio against a country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:decryption_progress] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -168,7 +168,7 @@ alias[trigger:decryption_progress] = {
 }
 
 ###Check if any any occupied meets the trigger. tooltip=key can be defined to override title.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[trigger:any_occupied_country] = {
 	## cardinality = 0..1
@@ -178,7 +178,7 @@ alias[trigger:any_occupied_country] = {
 
 
 ###Check if all occupied countries meets the trigger. tooltip=key can be defined to override title.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[trigger:all_occupied_country] = {
 	## cardinality = 0..1
@@ -187,7 +187,7 @@ alias[trigger:all_occupied_country] = {
 }
 
 ###Check if any country with current scope's original tag meets the trigger.
-## scopes = { any }
+## scope = { any }
 alias[trigger:any_country_with_original_tag] = {
 	original_tag_to_check = enum[country_tags]
 	original_tag_to_check = scope[country]
@@ -198,7 +198,7 @@ alias[trigger:any_country_with_original_tag] = {
 
 
 ###Check if all country with current scope's original tag meets the trigger.
-## scopes = { any }
+## scope = { any }
 alias[trigger:all_country_with_original_tag] = {
 	original_tag_to_check = enum[country_tags]
 	original_tag_to_check = scope[country]
@@ -208,31 +208,31 @@ alias[trigger:all_country_with_original_tag] = {
 }
 
 ###Has country done this intelligence agency upgrade (to its highest level).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_done_agency_upgrade] = <intelligence_agency_upgrade>
 
 ###Check if country is Spy Master.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_spymaster] = bool
 
 ###Check the amount of foreign garrison manpower we have.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:foreign_manpower] = variable_field
 
 ###Check the amount of manpower needed by garrisons.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:garrison_manpower_need] = variable_field
 
 ###Checks the number of upgrade done in the intelligence agency.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:agency_upgrade_number] = variable_field
 
 ###Checks whether the operative is performing the given mission.
-## scopes = { operative }
+## scope = { operative }
 alias[trigger:operative_leader_mission] = enum[operative_missions]
 
 ###Compare the intel of the scoped country with the specified one.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:compare_intel_with] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -247,7 +247,7 @@ alias[trigger:compare_intel_with] = {
 }
 
 ###Check if all operatives meets the trigger. tooltip=key can be defined to override title.
-## scopes = { COUNTRY OPERATION }
+## scope = { COUNTRY OPERATION }
 ## push_scope = operative
 alias[trigger:all_operative_leader] = {
 	## cardinality = 0..1
@@ -256,7 +256,7 @@ alias[trigger:all_operative_leader] = {
 }
 
 ###Check if any operatives meets the trigger. tooltip=key can be defined to override title.
-## scopes = { COUNTRY OPERATION }
+## scope = { COUNTRY OPERATION }
 ## push_scope = operative
 alias[trigger:any_operative_leader] = {
 	## cardinality = 0..1
@@ -265,11 +265,11 @@ alias[trigger:any_operative_leader] = {
 }
 
 ###Checks whether the operative has the matching captured status.
-## scopes = { operative }
+## scope = { operative }
 alias[trigger:is_operative_captured] = bool
 
 ###Compare the absolute, percentage based, intel level the scoped country has over the specified one.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:intel_level_over] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -282,7 +282,7 @@ alias[trigger:intel_level_over] = {
 }
 
 ###Check if any of the states controlled by the scope country meets the trigger. tooltip=key can be defined to override title.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = state
 alias[trigger:any_controlled_state] = {
 	## cardinality = 0..1
@@ -291,7 +291,7 @@ alias[trigger:any_controlled_state] = {
 }
 
 ###Check if all of the states controlled by the scope country meets the trigger. tooltip=key can be defined to override title.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = state
 alias[trigger:all_controlled_state] = {
 	## cardinality = 0..1
@@ -300,64 +300,64 @@ alias[trigger:all_controlled_state] = {
 }
 
 ###Checks the number of operatives the country controls.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:num_of_operatives] = variable_field
 
 ###Checks the number of available operative slots a country has. If this differs from the number of operative, this does not mean the country can recruit an operative, but that it will eventually be able to.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:num_operative_slots] = variable_field
 
 ###Checks the number of operative a country can recruit right now. Note that this is not necessarily greater than zero if num_operative_slots returned a number greater than the number of operative.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:num_free_operative_slots] = variable_field
 
 ###Has country an active cryptology department.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_cryptology_department_active] = bool
 
 ###Checks if is currently decrypting a cipher.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_decrypting] = scope[country]
 
 ###Checks if is currently decrypting a cipher.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_decrypting] = enum[country_tags]
 
 ###Checks if fully decrypted a cipher.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_fully_decrypted] = scope[country]
 
 ###Checks if fully decrypted a cipher.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_fully_decrypted] = enum[country_tags]
 
 ###Checks if the country activated their active cipher decryption bonuses.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_active_decryption_bonuses_enabled] = scope[country]
 
 ###Checks if the country activated their active cipher decryption bonuses.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_active_decryption_bonuses_enabled] = enum[country_tags]
 
 ###Will compare towards the amount of fake intel divisions a country has control over.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:num_fake_intel_divisions] = variable_field
 
 ###Modulos a temp variable with another.
-## scopes = { any }
+## scope = { any }
 alias[trigger:modulo_temp_variable] = {
 	value_set[variable] = variable_field_32
 }
 
 ###Modulos a temp variable with another.
-## scopes = { any }
+## scope = { any }
 alias[trigger:modulo_temp_variable] = {
 	var = value_set[variable]
 	value = variable_field_32
 }
 
 ###Check if any country with current scoped country guarantees.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[trigger:any_guaranteed_country] = {
 	alias_name[trigger] = alias_match_left[trigger]
@@ -365,14 +365,14 @@ alias[trigger:any_guaranteed_country] = {
 
 
 ###Check if every country with current scoped country guarantees.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 ## push_scope = country
 alias[trigger:all_guaranteed_country] = {
 	alias_name[trigger] = alias_match_left[trigger]
 }
 
 ###Compares number of completed operations.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:num_finished_operations] = {
 	operation = <operation>
 	operation = value_set[token]
@@ -382,7 +382,7 @@ alias[trigger:num_finished_operations] = {
 }
 
 ###Checks the collaboration in a target country with our currently scoped country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_collaboration] = {
 	target = scope[country]
 	target = enum[country_tags]
@@ -390,37 +390,37 @@ alias[trigger:has_collaboration] = {
 }
 
 ###Checks if running a specific operation. Operation can be omitted to check for any operation.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_running_operation] = {
 	target = scope[country]
 	operation = <operation>
 }
 
 ###Checks if finished collecting of resources for an operation.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_finished_collecting_for_operation] = {
 	target = scope[country]
 	operation = <operation>
 }
 
 ###Checks conscription ratio of the country compared to target conscription ratio.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:conscription_ratio] = variable_field
 
 ###Checks the target conscription amount of the country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:target_conscription_amount] = variable_field
 
 ###Checks the current conscription amount of the country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:current_conscription_amount] = variable_field
 
 ###Checks the type of operation.
-## scopes = { OPERATION }
+## scope = { OPERATION }
 alias[trigger:is_operation_type] = <operation>
 
 ###Checks if preparing a specific operation.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:is_preparing_operation] = {
 	operation = <operation>
 	operation = variable_field
@@ -428,27 +428,27 @@ alias[trigger:is_preparing_operation] = {
 }
 
 ###Checks whether the operative is performing the given operation.
-## scopes = { operative }
+## scope = { operative }
 alias[trigger:operative_leader_operation] = <operation>
 
 ###Checks if the country could potentially declare a war on the target (according to game rules, relationship, etc... ).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:can_declare_war_on] = scope[country]
 
 ###Checks if the country could potentially declare a war on the target (according to game rules, relationship, etc... ).
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:can_declare_war_on] = enum[country_tags]
 
 ###Checks whether the operative has the specified nationality. NOTE: this is invalid on non-operatives.
-## scopes = { operative }
+## scope = { operative }
 alias[trigger:has_nationality] = scope[country]
 
 ###Checks whether the operative has the specified nationality. NOTE: this is invalid on non-operatives.
-## scopes = { operative }
+## scope = { operative }
 alias[trigger:has_nationality] = enum[country_tags]
 
 ###Checks network national coverage you have over a country.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:network_national_coverage] = {
 	target = enum[country_tags]
 	target = scope[country]
@@ -456,15 +456,15 @@ alias[trigger:network_national_coverage] = {
 }
 
 ###Checks whether a state is impassable.
-## scopes = { state }
+## scope = { state }
 alias[trigger:impassable] = bool
 
 ###Number of researched technologies.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:num_researched_technologies] = int_variable_field
 
 ###Checks if country has allowed ideas with specific traits more than limit.
-## scopes = { COUNTRY }
+## scope = { COUNTRY }
 alias[trigger:has_allowed_idea_with_traits] = {
 	idea = <country_leader_trait>
 	idea = {
@@ -487,27 +487,27 @@ alias[trigger:has_allowed_idea_with_traits] = {
 }
 
 ###Is leading volunteers in the target.
-## scopes = { UNIT_LEADER character }
+## scope = { UNIT_LEADER character }
 alias[trigger:is_leading_volunteer_group] = scope[country]
 
 ###Is leading volunteers in the target.
-## scopes = { UNIT_LEADER character }
+## scope = { UNIT_LEADER character }
 alias[trigger:is_leading_volunteer_group] = enum[country_tags]
 
 ###Is leading volunteers in a country with the original tag.
-## scopes = { UNIT_LEADER character }
+## scope = { UNIT_LEADER character }
 alias[trigger:is_leading_volunteer_group_with_original_country] = scope[country]
 
 ###Is leading volunteers in a country with the original tag.
-## scopes = { UNIT_LEADER character }
+## scope = { UNIT_LEADER character }
 alias[trigger:is_leading_volunteer_group_with_original_country] = enum[country_tags]
 
 ###Sets a temp variable to a random value.
-## scopes = { any }
+## scope = { any }
 alias[trigger:set_temp_variable_to_random] = value_set[variable]
 
 ###Sets a temp variable to a random value.
-## scopes = { any }
+## scope = { any }
 alias[trigger:set_temp_variable_to_random] = {
 	var = value_set[variable]
 	## cardinality = 0..1