Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
@@ -24,14 +24,9 @@
 			"Description": "",
 			"Technologies": [
 				{
-					"Name": "Suzko Txabalina",
-					"History": "Iberian tribesmen were noted for wrapping bundles of grass about the shafts of their throwing spears, soaking that in some sort of flammable pitch, then setting it afire just before throwing.",
-					"Description": "Causes targets struck to become inflamed and lose hitpoints at a constant rate until and if either healed or repaired, as appropriate."
-				},
-				{
-					"Name": "Maisu Burdina Langileak",
-					"History": "The Iberians were known to produce the finest iron and steel implements and weapons of the age. The famous 'Toledo Steel.'",
-					"Description": "Metal costs for units and technologies reduced by 50%."
+					"Name": "Toledo Steel",
+					"History": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.",
+					"Description": "Swordsmen +20% attack damage."
 				}
 			],
 			"Heroes": [
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
@@ -31,6 +31,11 @@
 					"Name": "Archery Tradition",
 					"History": "The Indian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
 					"Description": "Archers −10% training time, +8 attack range, and −10% ranged attack spread."
+				},
+				{
+					"Name": "Wootz Steel",
+					"History": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.",
+					"Description": "Swordsmen +20% attack damage."
 				}
 			],
 			"Heroes": [
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
@@ -6,15 +6,26 @@
 	},
 	"description": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.",
 	"cost": { "food": 0, "wood": 200, "stone": 0, "metal": 200 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "any": [{ "civ": "iber" }, { "civ": "maur" }] }] },
+	"requirements": {
+		"all": [
+			{ "tech": "phase_city" },
+			{
+				"any": [
+					{ "civ": "iber" },
+					{ "civ": "maur" }
+				]
+			}
+		]
+	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "metalworker.png",
 	"researchTime": 60,
-	"tooltip": "+20% Hack attack for all swordsmen and macemen.",
+	"tooltip": "Swordsmen +20% attack damage.",
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
 	],
-	"affects": ["Swordsman", "Maceman"],
+	"affects": ["Swordsman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -6,11 +6,11 @@
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
-        <Crush>10.5</Crush>
+        <Crush>14</Crush>
       </Damage>
-      <MaxRange>3.5</MaxRange>
-      <PrepareTime>375</PrepareTime>
-      <RepeatTime>750</RepeatTime>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Health>
@@ -19,9 +19,6 @@
   <Identity>
     <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
     <GenericName>Champion Maceman</GenericName>
-    <Formations datatype="tokens">
-      special/formations/testudo
-    </Formations>
   </Identity>
   <Resistance>
     <Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
@@ -4,9 +4,13 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>3.0</Hack>
-        <Crush>2.5</Crush>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>7</Crush>
       </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Builder>