diff --git a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
index 3297ca2b28..5b43e28025 100644
--- a/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/athenians/corral.xml
@@ -2,23 +2,22 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Hellenes Corral">
+    <variant frequency="1" name="Athenians Corral">
       <mesh>structural/hele_corral.dae</mesh>
       <props>
         <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
         <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/corral_water.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_water.xml" attachpoint="root"/>
       </props>
       <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_corral.png" name="aoTex"/>
-
-</textures>
+        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_corral.png" name="aoTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -31,9 +30,8 @@
         <prop actor="props/structures/hellenes/corral_ceiling.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-<prop actor="props/structures/decals/corral_hay.xml" attachpoint="root"/>
-<prop actor="props/structures/decals/corral_plants.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml b/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml
index 3297ca2b28..75082976d8 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/corral.xml
@@ -1,41 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Hellenes Corral">
-      <mesh>structural/hele_corral.dae</mesh>
-      <props>
-        <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
-<prop actor="props/structures/hellenes/corral_water.xml" attachpoint="root"/>
-      </props>
-      <textures>
-<texture file="structural/hele_struct_b.dds" name="baseTex"/>
-<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
-<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
-<texture file="structural/ao/hele_corral.png" name="aoTex"/>
-
-</textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_ceiling.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
-        <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
-        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
-<prop actor="props/structures/decals/corral_hay.xml" attachpoint="root"/>
-<prop actor="props/structures/decals/corral_plants.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Hellenes Corral">
+      <mesh>structural/hele_corral.dae</mesh>
+      <props>
+        <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/hele_corral_mud.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_water.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="structural/hele_struct_b.dds" name="baseTex"/>
+        <texture file="structural/hele_struct_b_norm.png" name="normTex"/>
+        <texture file="structural/hele_struct_b_spec.png" name="specTex"/>
+        <texture file="structural/ao/hele_corral.png" name="aoTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="death">
+      <props>
+        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
+        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_ceiling.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_doors.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_roof.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_hay.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/corral_plants.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_ao_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml b/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml
index 9a179a5647..5d353c6c39 100644
--- a/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Acropolis 05.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f22ea38de57fb30e970c1e1289d89aef45a877c6228d1ab3c3e4810ce04a7d9f
-size 745758
+oid sha256:90a8b649f346b500f2bc86566b8a323e0ef0ec462dd38c119c145c074397919a
+size 745772
diff --git a/binaries/data/mods/public/maps/scenarios/Height Map Import - Four Oases.png b/binaries/data/mods/public/maps/scenarios/Height Map Import - Four Oases.png
new file mode 100644
index 0000000000..dff2e4e340
--- /dev/null
+++ b/binaries/data/mods/public/maps/scenarios/Height Map Import - Four Oases.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f772c8fdcb9d6b5e1208f310716201913d6af472f4a4f572e23686d2cbab926f
+size 36082
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis 06.xml b/binaries/data/mods/public/maps/scenarios/Oasis 06.xml
index 3c50642842..537ed4fb06 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis 06.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Oasis 06.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3071191c74093e5db1ba96708028e7b8ab1ad1adf68b7d74be84ee50e92f063c
-size 202845
+oid sha256:9c10b6716beb51332c2b160eb78ff1ae4cbf755c5e41ffb616932ac792fbe5e2
+size 202925
diff --git a/binaries/data/mods/public/simulation/templates/other/pers_apartment_block.xml b/binaries/data/mods/public/simulation/templates/other/pers_apartment_block.xml
index b8e871f161..4fac6d109f 100644
--- a/binaries/data/mods/public/simulation/templates/other/pers_apartment_block.xml
+++ b/binaries/data/mods/public/simulation/templates/other/pers_apartment_block.xml
@@ -21,12 +21,6 @@
   <TerritoryInfluence>
     <Radius>25</Radius>
   </TerritoryInfluence>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_female_citizen
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>props/structures/persians/alt_building_03.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/other/pers_inn.xml b/binaries/data/mods/public/simulation/templates/other/pers_inn.xml
index 90eabcf7d7..b48e7213ed 100644
--- a/binaries/data/mods/public/simulation/templates/other/pers_inn.xml
+++ b/binaries/data/mods/public/simulation/templates/other/pers_inn.xml
@@ -21,12 +21,6 @@
   <TerritoryInfluence>
     <Radius>26</Radius>
   </TerritoryInfluence>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_female_citizen
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>props/structures/persians/alt_building_04.xml</Actor>
   </VisualActor>