Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/athen_catafalque_2.json
@@ -2,8 +2,8 @@
 	"type": "global",
 	"affects": ["Economic"],
 	"modifications": [
-		{ "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/food", "multiply": 0.9 },
+		{ "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/metal", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/stone", "multiply": 0.9 }
 	],
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/mace_catafalque.json
@@ -2,11 +2,10 @@
 	"type": "global",
 	"affects": ["Human", "Mechanical", "Structure"],
 	"modifications": [
-		{ "value": "Looter/Resource/metal", "mutiply": 1.25 },
-		{ "value": "Looter/Resource/wood", "mutiply": 1.25 },
-		{ "value": "Looter/Resource/stone", "mutiply": 1.25 },
-		{ "value": "Looter/Resource/metal", "multiply": 1.25 }
+		{ "value": "Looter/Resource/food", "add": 5 },
+		{ "value": "Looter/Resource/wood", "add": 5 }
+
 	],
 	"auraName": "Sacker of Cities",
-	"auraDescription": "During the First Macedonian War, Philip and his troops sacked Thermum, the religious and political centre of Aetolia.\n+25% loot for every enemy unit killed or structure destroyed."
+	"auraDescription": "During the First Macedonian War, Philip and his troops sacked Thermum, the religious and political centre of Aetolia.\n+5 food and wood for every enemy unit killed or structure destroyed."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/pers_catafalque.json
@@ -4,8 +4,8 @@
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.95 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.95 },
-		{ "value": "Cost/Resources/stone", "multiply": 0.95 },
 		{ "value": "Cost/Resources/metal", "multiply": 0.95 },
+		{ "value": "Cost/Resources/stone", "multiply": 0.95 },
 		{ "value": "Health/Max", "multiply": 1.05 }
 	],
 	"auraName": "Great Builder",
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/ptol_catafalque.json
@@ -2,8 +2,8 @@
 	"type": "global",
 	"affects": ["Structure"],
 	"modifications": [
-		{ "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/food", "multiply": 0.9 },
+		{ "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/metal", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/stone", "multiply": 0.9 }
 	],
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/rome_catafalque_2.json
@@ -2,10 +2,10 @@
 	"type": "global",
 	"affects": ["Human", "Mechanical"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "multiply": 1.1 },
-		{ "value": "Armour/Hack", "multiply": 1.1 },
-		{ "value": "Armour/Crush", "multiply": 1.1 }
+		{ "value": "Armour/Pierce", "add": 1 },
+		{ "value": "Armour/Hack", "add": 1 },
+		{ "value": "Armour/Crush", "add": 1 }
 	],
 	"auraName": "Founder and Defender of the Republic Aura",
-	"auraDescription": "Brutus was one of the key figures in the overthrow of the monarchy and the founding of the Roman Republic. Later, as consul he led a Roman army to victory against the Etruscan King Tarquinius who sought to retake the throne.\n+10% armor for all units and siege engines."
+	"auraDescription": "Brutus was one of the key figures in the overthrow of the monarchy and the founding of the Roman Republic. Later, as consul he led a Roman army to victory against the Etruscan King Tarquinius who sought to retake the throne.\n+1 armor for all units and siege engines."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_1.json
@@ -2,8 +2,8 @@
 	"type": "global",
 	"affects": ["Temple"],
 	"modifications": [
-		{ "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/food", "multiply": 0.9 },
+		{ "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/metal", "multiply": 0.9 },
 		{ "value": "ProductionQueue/TechCostMultiplier/stone", "multiply": 0.9 },
 		{ "value": "Cost/Resources/food", "multiply": 0.9 },
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_2.json
@@ -1,5 +1,5 @@
 {
-	"type": "global",
+	"type": "player",
 	"affects": ["Player"],
 	"modifications": [
 		{ "value": "Player/MaxPopulation", "multiply": 1.05 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/sele_catafalque_3.json
@@ -4,8 +4,8 @@
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.9 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.9 },
-		{ "value": "Cost/Resources/stone", "multiply": 0.9 },
-		{ "value": "Cost/Resources/metal", "multiply": 0.9 }
+		{ "value": "Cost/Resources/metal", "multiply": 0.9 },
+		{ "value": "Cost/Resources/stone", "multiply": 0.9 }
 	],
 	"auraName": "Basileus Megas (Great King)",
 	"auraDescription": "Son of Selecus Nicator, Antiochus succeeded in the formidable task of keeping the empire together, meanwhile founding temples and defeating the invading Gauls with war elephants.\n-10% cost for War Elephants."
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/catafalques/spart_catafalque_2.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Champion Spear"],
+	"affects": ["Champion Spear Infantry"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.95 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.95 },
@@ -8,5 +8,5 @@
 		{ "value": "Cost/Resources/stone", "multiply": 0.95 }
 	],
 	"auraName": "Lycurgan Military Reforms",
-	"auraDescription": "-5% resource cost for spear champions."
+	"auraDescription": "-5% resource cost for spear infantry champions."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/athen_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Solon</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/brit_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Cassivellaunus</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/cart_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Hasdrubal (Quartermaster)</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/gaul_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Ambiorix</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/iber_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Mandonius</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/mace_catafalque.xml
@@ -13,4 +13,3 @@
     <Interval>1250</Interval>
 </ResourceTrickle>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/maur_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Bindusara</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/pers_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Artaxerxes II</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/ptol_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Ptolemy III Euergetes (Benefactor)</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/rome_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Lucius Junius Brutus</SpecificName>
   </Identity>
 </Entity>
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/catafalque/spart_catafalque.xml
@@ -6,4 +6,3 @@
     <SpecificName>Lycurgus</SpecificName>
   </Identity>
 </Entity>
-