diff --git a/binaries/data/mods/public/civs/spart.json b/binaries/data/mods/public/civs/spart.json
index cdb2372f81..d9e815d477 100644
--- a/binaries/data/mods/public/civs/spart.json
+++ b/binaries/data/mods/public/civs/spart.json
@@ -143,6 +143,7 @@
 	"AINames":
 	[
 		"Leonidas",
+		"Dienekes",
 		"Brasidas",
 		"Agis",
 		"Archidamus",
diff --git a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.pmp b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.pmp
index 46947d719c..01d19452ef 100644
--- a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.pmp	
+++ b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.pmp	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:090488c806dfa8995ccb5413f452c80303848c56ffc75234e2168d9bcdc2d89e
-size 657026
+oid sha256:efa26474003573b23b7f786e969f37001fbe0921c72b147bda3b12d64eac57bd
+size 657040
diff --git a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.xml b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.xml
index 1f3ddbcf01..905520414c 100644
--- a/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Cycladic Archipelago 06.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afe038d8939c5b72b18594c8a7054ab8f1b58ce50af4004b998c0accd105ad69
-size 246068
+oid sha256:1607976cf306e879a708e5f1e9692d0754e8bfe162048777ef9aa37e6e3798eb
+size 268641
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
index 025a7b36fe..14896fa509 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
@@ -1,62 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
-  <Footprint>
-    <Circle radius="10.0"/>
-    <Height>2.5</Height>
-  </Footprint>
-  <Health>
-    <Max>300</Max>
-  </Health>
   <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Whale</GenericName>
     <SpecificName>Fin Whale</SpecificName>
-	<Tooltip>Kill, then collect food from this bountiful oceanic resource.</Tooltip>
-    <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="4.0"/>
-  </Obstruction>
-  <Position>
-	<Altitude>-0.5</Altitude>
-	<Floating>true</Floating>
-  </Position>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>2000</Amount>
-    <Type>food.fish</Type>
-  </ResourceSupply>
-  <Selectable>
-    <Overlay>
-	  <Texture disable=""/>
-      <Outline>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.4</LineThickness>
-      </Outline>
-    </Overlay>
-  </Selectable>
-  <StatusBars>
-    <BarWidth>4.0</BarWidth>
-    <BarHeight>0.666</BarHeight>
-    <HeightOffset>5.0</HeightOffset>
-  </StatusBars>
-  <UnitAI>
-    <NaturalBehaviour>skittish</NaturalBehaviour>
-    <RoamDistance>30.0</RoamDistance>
-    <FleeDistance>60.0</FleeDistance>
-    <RoamTimeMin>100000</RoamTimeMin>
-    <RoamTimeMax>300000</RoamTimeMax>
-    <FeedTimeMin>1000</FeedTimeMin>
-    <FeedTimeMax>2000</FeedTimeMax>
-  </UnitAI>
-  <UnitMotion>
-    <PassabilityClass>ship</PassabilityClass>
-    <WalkSpeed>10.0</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>fauna/whale_fin.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
index 51a892c784..9a40387ec8 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
@@ -4,54 +4,9 @@
     <Circle radius="10.0"/>
     <Height>2.5</Height>
   </Footprint>
-  <Health>
-    <Max>500</Max>
-  </Health>
   <Identity>
-    <Civ>gaia</Civ>
-    <GenericName>Whale</GenericName>
     <SpecificName>Humpback Whale</SpecificName>
-	<Tooltip>Collect food from this bountiful oceanic resource.</Tooltip>
-    <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
-  <Obstruction>
-    <Unit radius="4.0"/>
-  </Obstruction>
-  <Position>
-	<Altitude>-4.0</Altitude>
-	<Floating>true</Floating>
-  </Position>
-  <ResourceSupply>
-    <KillBeforeGather>true</KillBeforeGather>
-    <Amount>2000</Amount>
-    <Type>food.fish</Type>
-  </ResourceSupply>
-  <Selectable>
-    <Overlay>
-	  <Texture disable=""/>
-      <Outline>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.4</LineThickness>
-      </Outline>
-    </Overlay>
-  </Selectable>
-  <UnitAI>
-    <NaturalBehaviour>skittish</NaturalBehaviour>
-    <RoamDistance>20.0</RoamDistance>
-    <FleeDistance>40.0</FleeDistance>
-    <RoamTimeMin>10000</RoamTimeMin>
-    <RoamTimeMax>30000</RoamTimeMax>
-    <FeedTimeMin>1000</FeedTimeMin>
-    <FeedTimeMax>2000</FeedTimeMax>
-  </UnitAI>
-  <UnitMotion>
-    <PassabilityClass>ship</PassabilityClass>
-    <WalkSpeed>2.0</WalkSpeed>
-    <Run>
-      <Speed>6.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>fauna/whale.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food_barrels_buried.xml b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food_barrels_buried.xml
index 3fa9f821e1..52b2b0c6f7 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food_barrels_buried.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/special_treasure_food_barrels_buried.xml
@@ -13,6 +13,9 @@
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
+  <Position>
+	<Floating>false</Floating>
+  </Position>
   <ResourceSupply>
     <Amount>200</Amount>
     <Type>treasure.food</Type>
diff --git a/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml b/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml
index cc57fc0dd7..4d9f9caa8f 100644
--- a/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml
+++ b/binaries/data/mods/public/simulation/templates/other/special_treasure_shipwreck_debris.xml
@@ -14,6 +14,7 @@
     <Static width="7.0" depth="7.0"/>
   </Obstruction>
   <Position>
+	<Altitude>-0.1</Altitude>
     <Floating>true</Floating>
   </Position>
   <ResourceSupply>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
index d2f28171d7..e10fba7060 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -1,18 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
+  <Footprint>
+    <Circle radius="10.0"/>
+    <Height>2.5</Height>
+  </Footprint>
   <Health>
-    <Max>100</Max>
+    <Max>200</Max>
     <DeathType>remain</DeathType>
     <Unhealable>true</Unhealable>
     <Repairable>false</Repairable>
   </Health>
   <Identity>
     <Classes datatype="tokens">SeaCreature</Classes>
+    <Civ>gaia</Civ>
+    <GenericName>Cetacean</GenericName>
+	<Tooltip>Kill, then collect food from this bountiful oceanic resource.</Tooltip>
+    <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
+  <Obstruction>
+    <Unit radius="4.0"/>
+  </Obstruction>
+  <Position>
+	<Altitude>-0.5</Altitude>
+	<Floating>true</Floating>
+  </Position>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
-    <Amount>500</Amount>
+    <Amount>2000</Amount>
     <Type>food.meat</Type>
-	<MaxGatherers>4</MaxGatherers>
+	<MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
+  <Selectable>
+    <Overlay>
+	  <Texture disable=""/>
+      <Outline>
+        <LineTexture>outline_border.png</LineTexture>
+        <LineTextureMask>outline_border_mask.png</LineTextureMask>
+        <LineThickness>0.4</LineThickness>
+      </Outline>
+    </Overlay>
+  </Selectable>
+  <StatusBars>
+    <BarWidth>4.0</BarWidth>
+    <BarHeight>0.666</BarHeight>
+    <HeightOffset>5.0</HeightOffset>
+  </StatusBars>
+  <UnitAI>
+    <NaturalBehaviour>skittish</NaturalBehaviour>
+    <RoamDistance>60.0</RoamDistance>
+    <FleeDistance>60.0</FleeDistance>
+    <RoamTimeMin>100000</RoamTimeMin>
+    <RoamTimeMax>300000</RoamTimeMax>
+    <FeedTimeMin>10000</FeedTimeMin>
+    <FeedTimeMax>20000</FeedTimeMax>
+  </UnitAI>
+  <UnitMotion>
+    <PassabilityClass>ship</PassabilityClass>
+    <WalkSpeed>10.0</WalkSpeed>
+    <Run>
+      <Speed>15.0</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
index 42eb1a5e5b..71072f723c 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <metal>80</metal>
+      <wood>0</wood>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>cart</Civ>
 	<GenericName>Sacred Band Infantry</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_sacred_band_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/cart_sacred_band_cavalry.xml
index 26cd60ec5d..8fb88a6fa3 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_sacred_band_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_sacred_band_cavalry.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
+  <Cost>
+    <Resources>
+      <metal>80</metal>
+      <wood>0</wood>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>cart</Civ>
 	<GenericName>Sacred Band Cavalry</GenericName>