Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json
@@ -1,18 +0,0 @@
-{
-	"genericName": "Lead hull sheathing",
-	"description": "Lead sheathing protects ship hulls.",
-	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 350 },
-	"requirements": { "tech": "phase_city" },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"supersedes": "armor_ship_hypozomata",
-	"icon": "armor_ship_gold.png",
-	"researchTime": 40,
-	"tooltip": "Ships +2 armor.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 2 }
-	],
-	"affects": ["Ship"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json
@@ -1,18 +0,0 @@
-{
-	"genericName": "Hypozomata undergirding",
-	"description": "The hypozomata braces the structure of a ship.",
-	"cost": { "food": 0, "wood": 150, "stone": 0, "metal": 150 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"supersedes": "armor_ship_reinforcedhull",
-	"icon": "armor_ship_silver.png",
-	"researchTime": 40,
-	"tooltip": "Ships +2 armor.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 2 }
-	],
-	"affects": ["Ship"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json
@@ -1,17 +0,0 @@
-{
-	"genericName": "Reinforced hull",
-	"description": "Wooden reinforcement beams for ship hulls.",
-	"cost": { "food": 0, "wood": 250, "stone": 0, "metal": 0 },
-	"requirements": { "tech": "phase_village" },
-	"requirementsTooltip": "Unlocked in Village Phase.",
-	"icon": "armor_ship_bronze.png",
-	"researchTime": 40,
-	"tooltip": "Ships +2 armor.",
-	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 2 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 2 }
-	],
-	"affects": ["Ship"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json
@@ -1,15 +0,0 @@
-{
-	"genericName": "Phoenician Naval Architects",
-	"description": "Significantly increase build speed of batches of ships at the Shipyard.",
-	"cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "civ": "cart" }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "calipers.png",
-	"researchTime": 40,
-	"tooltip": "Shipyard increased batch construction speed bonus.",
-	"modifications": [
-		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
-	],
-	"affects": ["Shipyard"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_capacity.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_capacity.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_capacity.json
@@ -0,0 +1,16 @@
+{
+	"genericName": "Salting Fish",
+	"description": "Salting allows to preserve fish longer.",
+	"cost": { "food": 200, "wood": 100, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_town" },
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"supersedes": "fishing_boat_gather_rate",
+	"icon": "fish.png",
+	"researchTime": 50,
+	"tooltip": "Fishing Boats +20 food capacity.",
+	"modifications": [
+		{ "value": "ResourceGatherer/Capacities/food", "add": 20 }
+	],
+	"affects": ["FishingBoat"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_rate.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_rate.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_rate.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Fishing Net",
+	"description": "Use nets to improve the productivity of fishing boats.",
+	"cost": { "food": 0, "wood": 200, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_village" },
+	"requirementsTooltip": "Unlocked in Village Phase.",
+	"icon": "fishing_net.png",
+	"researchTime": 40,
+	"tooltip": "Fishing Boats +30% fish gather rate.",
+	"modifications": [
+		{ "value": "ResourceGatherer/Rates/food.fish", "multiply": 1.3 }
+	],
+	"affects": ["FishingBoat"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_capacity_fishing.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_capacity_fishing.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_capacity_fishing.json
@@ -1,16 +0,0 @@
-{
-	"genericName": "Salting Fish",
-	"description": "Salting allows to preserve fish longer.",
-	"cost": { "food": 200, "wood": 100, "stone": 0, "metal": 0 },
-	"requirements": { "tech": "phase_town" },
-	"requirementsTooltip": "Unlocked in Town Phase. Requires Fishing Net.",
-	"supersedes": "gather_fishing_net",
-	"icon": "fish.png",
-	"researchTime": 50,
-	"tooltip": "Fishing Boats +20 food capacity.",
-	"modifications": [
-		{ "value": "ResourceGatherer/Capacities/food", "add": 20 }
-	],
-	"affects": ["FishingBoat"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_fishing_net.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_fishing_net.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_fishing_net.json
@@ -1,15 +0,0 @@
-{
-	"genericName": "Fishing Net",
-	"description": "Use nets to improve the productivity of fishing boats.",
-	"cost": { "food": 0, "wood": 200, "stone": 0, "metal": 0 },
-	"requirements": { "tech": "phase_village" },
-	"requirementsTooltip": "Unlocked in Village Phase.",
-	"icon": "fishing_net.png",
-	"researchTime": 40,
-	"tooltip": "Fishing Boats +30% fish gather rate.",
-	"modifications": [
-		{ "value": "ResourceGatherer/Rates/food.fish", "multiply": 1.3 }
-	],
-	"affects": ["FishingBoat"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_cost_time.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_cost_time.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_cost_time.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Naval Architects",
+	"description": "Employ skilled shipwrights with specialized tools to speed up ship construction.",
+	"cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "calipers.png",
+	"researchTime": 60,
+	"tooltip": "Ships −20% construction time.",
+	"modifications": [
+		{ "value": "Cost/BuildTime", "multiply": 0.8 }
+	],
+	"affects": ["Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_health.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_health.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_health.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Reinforced hull",
+	"description": "Wooden reinforcement beams for ship hulls.",
+	"cost": { "food": 0, "wood": 600, "stone": 0, "metal": 200 },
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "armor_ship_bronze.png",
+	"researchTime": 60,
+	"tooltip": "Ships +25% health.",
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.25 }
+	],
+	"affects": ["Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json
@@ -0,0 +1,15 @@
+{
+	"genericName": "Experienced Crews",
+	"description": "Train your oarsmen and sailors to move more efficiently and speed up your ships.",
+	"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 },
+	"requirements": { "tech": "phase_city" },
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "armor_ship_silver.png",
+	"researchTime": 60,
+	"tooltip": "Ships +10% movement speed.",
+	"modifications": [
+		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.1 }
+	],
+	"affects": ["Ship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json
@@ -1,15 +0,0 @@
-{
-	"genericName": "Naval Architects",
-	"description": "Significantly increase build speed of batches of ships at the Dock.",
-	"cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 },
-	"requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "cart" }] },
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "calipers.png",
-	"researchTime": 40,
-	"tooltip": "Docks increased batch construction speed bonus.",
-	"modifications": [
-		{ "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 }
-	],
-	"affects": ["Dock"],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml
@@ -16,7 +16,6 @@
     <Civ>cart</Civ>
     <GenericName>Commercial Port</GenericName>
     <SpecificName>Namel</SpecificName>
-    <Tooltip>Construct fishing boats to gather meat and merchant ships to trade with other docks.</Tooltip>
   </Identity>
   <Loot>
     <wood>30</wood>
@@ -27,11 +26,6 @@
   <Obstruction>
     <Static width="30.0" depth="19.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -training_naval_architects
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/dock.xml</Actor>
     <FoundationActor>structures/fndn_6x4_dock.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="14.0" depth="24.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/ship_fire
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/dock.xml</Actor>
     <FoundationActor>structures/fndn_dock_iber.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml
@@ -11,11 +11,6 @@
   <Obstruction>
     <Static width="22.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -armor_ship_hullsheathing
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/dock.xml</Actor>
     <FoundationActor>structures/fndn_6x4_dock.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="23.0" depth="15.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      persians/special_equine_transports
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/dock.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml
@@ -13,7 +13,6 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/ship_quinquereme
       units/{civ}/champion_juggernaut
     </Entities>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="20.0" depth="24.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/ship_quinquereme
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/dock.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml
@@ -11,11 +11,6 @@
   <Obstruction>
     <Static width="22.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/ship_quinquereme
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/seleucids/dock.xml</Actor>
     <FoundationActor>structures/fndn_6x4_dock.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
@@ -51,14 +51,16 @@
       units/{civ}/ship_merchant
       units/{civ}/ship_bireme
       units/{civ}/ship_trireme
+      units/{civ}/ship_quinquereme
+      units/{civ}/ship_fire
     </Entities>
     <Technologies datatype="tokens">
-      gather_capacity_fishing
-      gather_fishing_net
-      training_naval_architects
-      armor_ship_reinforcedhull
-      armor_ship_hypozomata
-      armor_ship_hullsheathing
+      fishing_boat_gather_rate
+      fishing_boat_gather_capacity
+      ship_cost_time
+      ship_health
+      ship_movement_speed
+      persians/special_equine_transports
     </Technologies>
   </ProductionQueue>
   <RallyPointRenderer>