diff --git a/AndorsTrail/res/raw/itemlist_v070.json b/AndorsTrail/res/raw/itemlist_v070.json
index d8cc31835..512c27b4b 100644
--- a/AndorsTrail/res/raw/itemlist_v070.json
+++ b/AndorsTrail/res/raw/itemlist_v070.json
@@ -698,7 +698,7 @@
     {
         "id":"hmr_iron",
         "iconID":"items_weapons_3:16",
-        "name":"Iron warhammer",
+        "name":"Iron war hammer",
         "baseMarketCost":1,
         "category":"hammer",
         "equipEffect":{
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 8936ab5ee..a023cebd0 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -448,10 +448,10 @@
 	<string name="skill_prerequisite_other_skill">To level up this skill, you need at least level %1$d of the %2$s skill.</string>
 	<string name="skill_prerequisite_level">To level up this skill, you need at least experience level %1$d.</string>
 	<string name="skill_prerequisite_stat">To level up this skill, you need at least %1$d %2$s (base stats).</string>
-	<string name="skill_number_of_increases_one">You may select one skill to increase.</string>
-	<string name="skill_number_of_increases_several">You may select %1$d skills to increase.</string>
-	<string name="levelup_adds_new_skillpoint">This level also gives you a new skill point to spend!</string>
-
+	<string name="skill_number_of_increases_one">You may select one skill to improve.</string>
+	<string name="skill_number_of_increases_several">You may select %1$d skills to improve.</string>
+	<string name="levelup_adds_new_skillpoint">This level also gives you a new skill point to spend!</string>
+
 	<string name="loadsave_save_to_new_slot">Create new savegame slot</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Overwrite savegame?</string>
 	<string name="loadsave_save_overwrite_confirmation">This savegame contains a different player name (%1$s) than your current player name (%2$s). Are you sure you want to overwrite this savegame?</string>
@@ -470,7 +470,7 @@
 
 	<string name="traitsinfo_base_max_hp">Max HP:</string>
 	<string name="traitsinfo_base_max_ap">Max AP:</string>
-	<string name="menu_save_saving_not_allowed_in_combat">Cannot save the game while in combat.</string>
+	<string name="menu_save_saving_not_allowed_in_combat">Cannot save the game in the heat of combat.</string>
 
 	<string name="preferences_optimized_drawing_title">Optimized drawing</string>
 	<string name="preferences_optimized_drawing">Disable this if you see graphical artifacts. Enabling this option will make the game only redraw changed parts of the screen every frame.</string>
@@ -604,7 +604,7 @@
 	<string name="skill_longdescription_weapon_prof_1hsword">For each skill level, increases attack chance of rapiers, longswords and broadswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_2hsword">For each skill level, increases attack chance of two-handed swords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_axe">For each skill level, increases attack chance of axes and greataxes by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
-	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of bludgeoning weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, warhammers and giant hammers.</string>
+	<string name="skill_longdescription_weapon_prof_blunt">For each skill level, increases attack chance of bludgeoning weapons by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill. This includes clubs, quarterstaves, maces, scepters, war hammers and giant hammers.</string>
 	<string name="skill_longdescription_weapon_prof_unarmed">When fighting without a weapon and shield, gain %1$d attack chance, %2$d damage potential and %3$d block chance per skill level.</string>
 	<string name="skill_longdescription_armor_prof_shield">Increase damage resistance by %1$d per skill level while having a shield equipped.</string>
 	<string name="skill_longdescription_armor_prof_unarmored">While fighting without having any piece of armor equipped, gain %1$d block chance per skill level. Items made of cloth are not considered as being armor.</string>