diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index 97ba25ef8b..b081b1faf8 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -37,6 +37,7 @@
 			{"nick": "Caius", "name": "Lars Kemmann"},
 			{"nick": "Calefaction", "name": "Matt Holmes"},
 			{"nick": "Calvinh", "name": "Carl-Johan Höiby"},
+			{"nick": "causative", "name": "Bart Parkis"},
 			{"name": "Cédric Houbart"},
 			{"nick": "Chakakhan", "name": "Kenny Long"},
 			{"nick": "Clockwork-Muse", "name": "Stephen A. Imhoff"},
diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index 6ce31e967d..4ffab905c8 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -5485,6 +5485,11 @@ UnitAI.prototype.FindWalkAndFightTargets = function()
 		this.PushOrderFront("Attack", { "target": targ, "force": true, "allowCapture": true });
 		return true;
 	}
+
+	// healers on a walk-and-fight order should heal injured units
+	if (this.IsHealer())
+		return this.FindNewHealTargets();
+	
 	return false;
 };
 
diff --git a/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json b/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
index 9a33cce54d..7ecfd887de 100644
--- a/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
+++ b/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
@@ -13,7 +13,8 @@
 		{"value": "Attack/Ranged/Spread",       "multiply": 0.95, "affects": "Ranged"  },
 		{"value": "Attack/Melee/Hack",          "multiply": 1.2,  "affects": "Melee"   },
 		{"value": "Attack/Melee/Pierce",        "multiply": 1.2,  "affects": "Melee"   },
-		{"value": "Heal/Range",                 "add":      4,    "affects": "Healer"  },
+		{"value": "Vision/Range",               "add":      3,    "affects": "Healer"  },
+		{"value": "Heal/Range",                 "add":      3,    "affects": "Healer"  },
 		{"value": "Heal/HP",                    "add":      5,    "affects": "Healer"  }
 	],
 	"affects": ["Advanced Unit", "Elite Unit"]
diff --git a/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json b/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
index afe3519cd4..7eedae7b6c 100644
--- a/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
+++ b/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
@@ -13,7 +13,8 @@
 		{"value": "Attack/Ranged/Spread",       "multiply": 0.95, "affects": "Ranged"  },
 		{"value": "Attack/Melee/Hack",          "multiply": 1.2,  "affects": "Melee"   },
 		{"value": "Attack/Melee/Pierce",        "multiply": 1.2,  "affects": "Melee"   },
-		{"value": "Heal/Range",                 "add":      4,    "affects": "Healer"  },
+		{"value": "Vision/Range",               "add":      3,    "affects": "Healer"  },
+		{"value": "Heal/Range",                 "add":      3,    "affects": "Healer"  },
 		{"value": "Heal/HP",                    "add":      5,    "affects": "Healer"  }
 	],
 	"affects": ["Elite Unit"]
diff --git a/binaries/data/mods/public/simulation/data/technologies/heal_range.json b/binaries/data/mods/public/simulation/data/technologies/heal_range.json
index 1bb97458d9..3e770afe64 100644
--- a/binaries/data/mods/public/simulation/data/technologies/heal_range.json
+++ b/binaries/data/mods/public/simulation/data/technologies/heal_range.json
@@ -5,14 +5,14 @@
 		"spart": "Olympic Pantheon",
 		"athen": "Olympic Pantheon"
 	},
-	"description": "Increases the healing range of all healers.",
-	"cost": {"food": 500, "wood": 0, "stone": 0, "metal": 250},
+	"description": "Increases the healing and vision range of all healers.",
+	"cost": {"food": 400, "wood": 0, "stone": 0, "metal": 200},
 	"requirements": {"tech": "phase_town"},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "healing_range.png",
 	"researchTime": 40,
-	"tooltip": "Healers +8 Healing Range.",
-	"modifications": [{"value": "Heal/Range", "add": 8.0}],
+	"tooltip": "Healers +5 Healing and Vision Range.",
+	"modifications": [{"value": "Heal/Range", "add": 5.0}, {"value": "Vision/Range", "add": 5.0}],
 	"affects": ["Healer"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/heal_range_2.json b/binaries/data/mods/public/simulation/data/technologies/heal_range_2.json
index 1e83e887fa..a2d805fa29 100644
--- a/binaries/data/mods/public/simulation/data/technologies/heal_range_2.json
+++ b/binaries/data/mods/public/simulation/data/technologies/heal_range_2.json
@@ -5,15 +5,15 @@
 		"spart": "Akadḗmeia",
 		"athen": "Akadḗmeia"
 	},
-	"description": "Increases the healing range of all healers.",
-	"cost": {"food": 1000, "wood": 0, "stone": 0, "metal": 500},
+	"description": "Increases the healing and vision range of all healers.",
+	"cost": {"food": 800, "wood": 0, "stone": 0, "metal": 400},
 	"supersedes": "heal_range",
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "healing_range.png",
 	"researchTime": 40,
-	"tooltip": "Healers +8 Healing Range.",
-	"modifications": [{"value": "Heal/Range", "add": 8.0}],
+	"tooltip": "Healers +5 Healing and Vision Range.",
+	"modifications": [{"value": "Heal/Range", "add": 5.0}, {"value": "Vision/Range", "add": 5.0}],
 	"affects": ["Healer"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }