Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/garrison_heal.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/garrison_heal.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/garrison_heal.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Living Conditions",
+	"description": "Units regain health over time while garrisoned.",
+	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 250 },
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "bandage.png",
+	"researchTime": 40,
+	"tooltip": "Structures +1 garrison heal rate.",
+	"modifications": [
+		{ "value": "GarrisonHolder/BuffHeal", "add": 1 }
+	],
+	"affects": ["Structure !Outpost !Wall"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/heal_barracks.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/heal_barracks.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/heal_barracks.json
@@ -1,15 +0,0 @@
-{
-	"genericName": "Living Conditions",
-	"description": "Units garrisoned in Barracks heal over time.",
-	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 250 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "bandage.png",
-	"researchTime": 40,
-	"tooltip": "Units gain health over time while garrisoned in Barracks.",
-	"modifications": [
-		{ "value": "GarrisonHolder/BuffHeal", "add": 1 }
-	],
-	"affects": ["Barracks"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/heal_temple.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/heal_temple.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/heal_temple.json
@@ -1,20 +0,0 @@
-{
-	"genericName": "Divine Offerings",
-	"specificName": {
-		"athen": "Eleusian Mysteries",
-		"mace": "Olympic Games",
-		"spart": "Olympic Games"
-	},
-	"description": "Units garrisoned in a temple are healed faster.",
-	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 250 },
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "cauldron.png",
-	"researchTime": 40,
-	"tooltip": "Temples +50% garrisoned healing rate.",
-	"modifications": [
-		{ "value": "GarrisonHolder/BuffHeal", "multiply": 1.5 }
-	],
-	"affects": ["Temple"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
@@ -61,7 +61,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/tent.xml
@@ -15,11 +15,6 @@
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>200</Max>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -68,7 +68,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>1</LoadingRange>
   </GarrisonHolder>
   <Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -16,7 +16,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
@@ -52,7 +52,7 @@
       heal_range_2
       heal_rate
       heal_rate_2
-      heal_temple
+      garrison heal
       health_regen_units
     </Technologies>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -52,7 +52,6 @@
       units/{civ}/champion_maiden_barracks
     </Entities>
     <Technologies datatype="tokens">
-      heal_barracks
       persians/training_levy_infantry
       persians/training_conscription_infantry
       training_conscription
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -14,7 +14,6 @@
   <GarrisonHolder>
     <Max>5</Max>
     <List datatype="tokens">Elephant</List>
-    <BuffHeal>1</BuffHeal>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -13,7 +13,6 @@
   <GarrisonHolder>
     <Max>6</Max>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special.xml
@@ -9,7 +9,7 @@
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
+    <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>