diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..9cebe6d6d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,26 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# 4 space indentation
+[*.{c,h,lua}]
+indent_style = space
+indent_size = 4
+
+[*.{xml,json}]
+charset = utf-8
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Matches exact files
+[.travis.yml]
+indent_style = space
+indent_size = 2
diff --git a/res/adamantium.xml b/res/adamantium.xml
index d5cdd4fae..cc1cedadc 100644
--- a/res/adamantium.xml
+++ b/res/adamantium.xml
@@ -3,7 +3,7 @@
 
   <resource name="adamantium" limited="yes" material="rm_adamantium">
     <item weight="200" score="200">
-      <construction skill="mining" minskill="8" reqsize="1"/>
+      <construction skill="mining" minskill="8"/>
     </item>
     <resourcelimit>
       <modifier type="require" building="mine"/>
@@ -13,7 +13,7 @@
 
   <resource name="adamantiumaxe">
     <item weight="100" score="500">
-      <construction skill="weaponsmithing" minskill="8" reqsize="1">
+      <construction skill="weaponsmithing" minskill="8">
         <requirement type="adamantium" quantity="1"/>
         <requirement type="log" quantity="1"/>
       </construction>
@@ -26,7 +26,7 @@
 
   <resource name="adamantiumplate">
     <item weight="100" score="2000">
-      <construction skill="armorer" minskill="10" reqsize="1">
+      <construction skill="armorer" minskill="10">
         <requirement type="adamantium" quantity="3"/>
       </construction>
       <armor ac="7" penalty="0.1"/>
diff --git a/res/buildings/castle-2.xml b/res/buildings/castle-2.xml
index a54957415..593e9ae5e 100644
--- a/res/buildings/castle-2.xml
+++ b/res/buildings/castle-2.xml
@@ -3,22 +3,22 @@
   <function name="name" value="castle_name_2"/>
   <function name="protection" value="building_protection"/>
   <function name="taxes" value="lua_building_taxes"/>
-  <construction skill="building" minskill="1" maxsize="10" reqsize="1" defense_bonus="0">
+  <construction skill="building" minskill="1" maxsize="10" defense_bonus="0">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="2" maxsize="40" reqsize="1" defense_bonus="1">
+  <construction skill="building" minskill="2" maxsize="40" defense_bonus="1">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="3" maxsize="200" reqsize="1" defense_bonus="3">
+  <construction skill="building" minskill="3" maxsize="200" defense_bonus="3">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="4" maxsize="1000" reqsize="1" defense_bonus="5">
+  <construction skill="building" minskill="4" maxsize="1000" defense_bonus="5">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="5" maxsize="5000" reqsize="1" defense_bonus="8">
+  <construction skill="building" minskill="5" maxsize="5000" defense_bonus="8">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="6" reqsize="1" defense_bonus="12">
+  <construction skill="building" minskill="6" defense_bonus="12">
     <requirement type="stone" quantity="1"/>
   </construction>
 </building>
diff --git a/res/buildings/castle.xml b/res/buildings/castle.xml
index 9a63d7dc8..253f49811 100644
--- a/res/buildings/castle.xml
+++ b/res/buildings/castle.xml
@@ -2,25 +2,25 @@
 <building name="castle" capacity="1" fort="yes">
   <function name="name" value="castle_name"/>
   <function name="protection" value="building_protection"/>
-  <construction skill="building" minskill="1" maxsize="2" reqsize="1" defense_bonus="0">
+  <construction skill="building" minskill="1" maxsize="2" defense_bonus="0">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="1" maxsize="8" reqsize="1" defense_bonus="0">
+  <construction skill="building" minskill="1" maxsize="8" defense_bonus="0">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="2" maxsize="40" reqsize="1" defense_bonus="1">
+  <construction skill="building" minskill="2" maxsize="40" defense_bonus="1">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="3" maxsize="200" reqsize="1" defense_bonus="3">
+  <construction skill="building" minskill="3" maxsize="200" defense_bonus="3">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="4" maxsize="1000" reqsize="1" defense_bonus="5">
+  <construction skill="building" minskill="4" maxsize="1000" defense_bonus="5">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="5" maxsize="5000" reqsize="1" defense_bonus="8">
+  <construction skill="building" minskill="5" maxsize="5000" defense_bonus="8">
     <requirement type="stone" quantity="1"/>
   </construction>
-  <construction skill="building" minskill="6" reqsize="1" defense_bonus="12">
+  <construction skill="building" minskill="6" defense_bonus="12">
     <requirement type="stone" quantity="1"/>
   </construction>
 </building>
diff --git a/res/core/armor/chainmail.xml b/res/core/armor/chainmail.xml
index 81152f89e..b03221b35 100644
--- a/res/core/armor/chainmail.xml
+++ b/res/core/armor/chainmail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="chainmail">
   <item weight="200" score="90">
-    <construction skill="armorer" minskill="3" reqsize="1">
+    <construction skill="armorer" minskill="3">
       <requirement type="iron" quantity="3"/>
     </construction>
     <armor ac="3" penalty="0.15" magres="0.0"/>
diff --git a/res/core/armor/laenmail.xml b/res/core/armor/laenmail.xml
index bdcf6b7e1..0e1411945 100644
--- a/res/core/armor/laenmail.xml
+++ b/res/core/armor/laenmail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="laenmail">
   <item weight="100" score="1000">
-    <construction skill="armorer" minskill="9" reqsize="1">
+    <construction skill="armorer" minskill="9">
       <requirement type="laen" quantity="3"/>
     </construction>
     <armor ac="6" penalty="0.0" magres="0.3" laen="yes" />
diff --git a/res/core/armor/laenshield.xml b/res/core/armor/laenshield.xml
index f5eb2d783..8a9d6d5c3 100644
--- a/res/core/armor/laenshield.xml
+++ b/res/core/armor/laenshield.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="laenshield">
   <item weight="0" score="1000">
-    <construction skill="armorer" minskill="7" reqsize="1">
+    <construction skill="armorer" minskill="7">
       <requirement type="laen" quantity="1"/>
     </construction>
     <armor ac="2" penalty="-0.25" magres="0.3" laen="yes" shield="yes" />
diff --git a/res/core/armor/plate.xml b/res/core/armor/plate.xml
index eb10f6359..a22064e90 100644
--- a/res/core/armor/plate.xml
+++ b/res/core/armor/plate.xml
@@ -2,7 +2,7 @@
 <resource name="plate">
   <item weight="400" score="150">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="armorer" minskill="4" reqsize="1">
+    <construction skill="armorer" minskill="4">
       <requirement type="iron" quantity="5"/>
     </construction>
     <armor ac="5" penalty="0.30" magres="0.0"/>
diff --git a/res/core/armor/rustychainmail.xml b/res/core/armor/rustychainmail.xml
index a52b4db7b..b46380634 100644
--- a/res/core/armor/rustychainmail.xml
+++ b/res/core/armor/rustychainmail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="rustychainmail">
   <item weight="200" score="30">
-    <construction skill="armorer" minskill="3" reqsize="1">
+    <construction skill="armorer" minskill="3">
       <requirement type="iron" quantity="3"/>
     </construction>
     <armor ac="2" penalty="0.30" magres="0.0"/>
diff --git a/res/core/armor/rustyshield.xml b/res/core/armor/rustyshield.xml
index 4c34f7ee1..56a8abe5a 100644
--- a/res/core/armor/rustyshield.xml
+++ b/res/core/armor/rustyshield.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="rustyshield">
   <item weight="100" score="10">
-    <construction skill="armorer" minskill="2" reqsize="1">
+    <construction skill="armorer" minskill="2">
       <requirement type="iron" quantity="1"/>
     </construction>
     <armor ac="1" penalty="0.0" magres="0.0" shield="yes"/>
diff --git a/res/core/armor/shield.xml b/res/core/armor/shield.xml
index 9a72baf9a..b0ee7de3a 100644
--- a/res/core/armor/shield.xml
+++ b/res/core/armor/shield.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="shield">
   <item weight="100" score="30">
-    <construction skill="armorer" minskill="2" reqsize="1">
+    <construction skill="armorer" minskill="2">
       <requirement type="iron" quantity="1"/>
     </construction>
     <armor ac="1" penalty="-0.15" magres="0.0" shield="yes"/>
diff --git a/res/core/common/buildings.xml b/res/core/common/buildings.xml
index 63ac3e650..423e90deb 100644
--- a/res/core/common/buildings.xml
+++ b/res/core/common/buildings.xml
@@ -66,7 +66,7 @@
   </building>
 
   <building name="monument" namechange="no" capacity="1">
-    <construction skill="building" minskill="4" reqsize="1">
+    <construction skill="building" minskill="4">
       <requirement type="log" quantity="1"/>
       <requirement type="stone" quantity="1"/>
       <requirement type="iron" quantity="1"/>
@@ -76,7 +76,7 @@
 
   <building name="stables" capacity="1">
     <maintenance type="money" amount="150" vital="yes"/>
-    <construction skill="building" minskill="2" reqsize="1">
+    <construction skill="building" minskill="2">
       <requirement type="log" quantity="4"/>
       <requirement type="stone" quantity="2"/>
       <requirement type="iron" quantity="1"/>
@@ -86,7 +86,7 @@
 
   <building name="sawmill" capacity="1">
     <maintenance type="money" amount="250" vital="yes"/>
-    <construction skill="building" minskill="3" reqsize="1">
+    <construction skill="building" minskill="3">
       <requirement type="log" quantity="5"/>
       <requirement type="stone" quantity="5"/>
       <requirement type="iron" quantity="3"/>
@@ -98,7 +98,7 @@
     <function name="init" value="init_smithy"/>
     <maintenance type="money" amount="300" vital="yes"/>
     <maintenance type="log" amount="1"/>
-    <construction skill="building" minskill="3" reqsize="1">
+    <construction skill="building" minskill="3">
       <requirement type="log" quantity="5"/>
       <requirement type="stone" quantity="5"/>
       <requirement type="iron" quantity="2"/>
@@ -139,7 +139,7 @@
 
   <building name="quarry" capacity="1">
     <maintenance type="money" amount="250" vital="yes"/>
-    <construction skill="building" minskill="2" reqsize="1">
+    <construction skill="building" minskill="2">
       <requirement type="iron" quantity="1"/>
       <requirement type="log" quantity="5"/>
       <requirement type="stone" quantity="1"/>
@@ -149,7 +149,7 @@
 
   <building name="mine" capacity="1">
     <maintenance type="money" amount="500" vital="yes"/>
-    <construction skill="building" minskill="4" reqsize="1">
+    <construction skill="building" minskill="4">
       <requirement type="iron" quantity="1"/>
       <requirement type="log" quantity="10"/>
       <requirement type="stone" quantity="5"/>
@@ -159,7 +159,7 @@
 
   <building name="lighthouse" capacity="1" maxcapacity="4">
     <maintenance type="money" amount="100" vital="yes"/>
-    <construction skill="building" minskill="3" reqsize="1">
+    <construction skill="building" minskill="3">
       <requirement type="iron" quantity="1"/>
       <requirement type="log" quantity="1"/>
       <requirement type="stone" quantity="2"/>
diff --git a/res/core/common/construction.xml b/res/core/common/construction.xml
index 95dcb6a33..089ddfe1c 100644
--- a/res/core/common/construction.xml
+++ b/res/core/common/construction.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- TODO: this does not work yet -->
 <production>
-  <construction resource="laenshield" skill="armorer" minskill="7" reqsize="1">
+  <construction resource="laenshield" skill="armorer" minskill="7">
     <requirement type="laen" quantity="1"/>
   </construction>
-  <construction resource="laenmail" skill="armorer" minskill="9" reqsize="1">
+  <construction resource="laenmail" skill="armorer" minskill="9">
     <requirement type="laen" quantity="3"/>
   </construction>
 </production>
diff --git a/res/core/common/items.xml b/res/core/common/items.xml
index c8910e695..6afd220ff 100644
--- a/res/core/common/items.xml
+++ b/res/core/common/items.xml
@@ -143,7 +143,7 @@
 
   <resource name="catapultammo">
     <item weight="1000">
-      <construction skill="quarrying" minskill="3" reqsize="1">
+      <construction skill="quarrying" minskill="3">
         <requirement type="stone" quantity="1"/>
       </construction>
     </item>
diff --git a/res/core/common/potions.xml b/res/core/common/potions.xml
index f444e5a94..84b1e5f52 100644
--- a/res/core/common/potions.xml
+++ b/res/core/common/potions.xml
@@ -7,7 +7,7 @@
     <item weight="0" score="30">
       <function name="use" value="usepotion"/>
       <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
+      <construction skill="alchemy" minskill="2">
         <requirement type="h4"/>
         <requirement type="h12"/>
       </construction>
@@ -18,7 +18,7 @@
     <item weight="0" score="30">
       <function name="use" value="usepotion"/>
       <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
+      <construction skill="alchemy" minskill="2">
         <requirement type="h6"/>
         <requirement type="h13"/>
       </construction>
@@ -29,7 +29,7 @@
     <item weight="0" score="30">
       <function name="use" value="usepotion"/>
       <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
+      <construction skill="alchemy" minskill="2">
         <requirement type="h0"/>
         <requirement type="h13"/>
       </construction>
@@ -40,7 +40,7 @@
     <item weight="0" score="30">
       <function name="use" value="usepotion"/>
       <potion level="1"/>
-      <construction skill="alchemy" minskill="2" reqsize="1">
+      <construction skill="alchemy" minskill="2">
         <requirement type="h5"/>
         <requirement type="h7"/>
       </construction>
@@ -51,7 +51,7 @@
     <item weight="0" score="60">
       <function name="use" value="usepotion"/>
       <potion level="2"/>
-      <construction skill="alchemy" minskill="4" reqsize="1">
+      <construction skill="alchemy" minskill="4">
         <requirement type="h14"/>
         <requirement type="h16"/>
         <requirement type="h1"/>
@@ -64,7 +64,7 @@
     <item weight="0" score="60">
       <function name="use" value="usehealingpotion"/>
       <potion level="2"/>
-      <construction skill="alchemy" minskill="4" reqsize="1">
+      <construction skill="alchemy" minskill="4">
         <requirement type="h19"/>
         <requirement type="h4"/>
         <requirement type="h1"/>
@@ -77,7 +77,7 @@
     <item weight="0" score="60">
       <function name="use" value="usebloodpotion"/>
       <potion level="2"/>
-      <construction skill="alchemy" minskill="4" reqsize="1">
+      <construction skill="alchemy" minskill="4">
         <requirement type="h17"/>
         <requirement type="h13"/>
         <requirement type="h4"/>
@@ -90,7 +90,7 @@
     <item weight="0" score="90">
       <function name="use" value="usepotion"/>
       <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
+      <construction skill="alchemy" minskill="6">
         <requirement type="h9"/>
         <requirement type="h15"/>
         <requirement type="h12"/>
@@ -103,7 +103,7 @@
     <item weight="0" score="90">
       <function name="useonother" value="usefoolpotion"/>
       <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
+      <construction skill="alchemy" minskill="6">
         <requirement type="h2"/>
         <requirement type="h3"/>
         <requirement type="h17"/>
@@ -116,7 +116,7 @@
     <item weight="0" score="90">
       <function name="use" value="usewarmthpotion"/>
       <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
+      <construction skill="alchemy" minskill="6">
         <requirement type="h18"/>
         <requirement type="h3"/>
         <requirement type="h16"/>
@@ -129,7 +129,7 @@
     <item weight="0" score="90">
       <function name="use" value="usepotion"/>
       <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
+      <construction skill="alchemy" minskill="6">
         <requirement type="h4"/>
         <requirement type="h11"/>
         <requirement type="h10"/>
@@ -142,7 +142,7 @@
     <item weight="0" score="90">
       <function name="use" value="usepotion"/>
       <potion level="3"/>
-      <construction skill="alchemy" minskill="6" reqsize="1">
+      <construction skill="alchemy" minskill="6">
         <requirement type="h19"/>
         <requirement type="h14"/>
         <requirement type="h0"/>
@@ -155,7 +155,7 @@
     <item weight="0" score="120">
       <function name="use" value="usepotion"/>
       <potion level="4"/>
-      <construction skill="alchemy" minskill="8" reqsize="1">
+      <construction skill="alchemy" minskill="8">
         <requirement type="h14"/>
         <requirement type="h20"/>
         <requirement type="h15"/>
@@ -169,7 +169,7 @@
     <item weight="0" score="120">
       <function name="use" value="usepotion"/>
       <potion level="4"/>
-      <construction skill="alchemy" minskill="8" reqsize="1">
+      <construction skill="alchemy" minskill="8">
         <requirement type="h5"/>
         <requirement type="h9"/>
         <requirement type="h12"/>
@@ -184,7 +184,7 @@
     <item weight="0" score="120">
       <function name="use" value="usepotion"/>
       <potion level="4"/>
-      <construction skill="alchemy" minskill="8" reqsize="1">
+      <construction skill="alchemy" minskill="8">
         <requirement type="h6"/>
         <requirement type="h12"/>
         <requirement type="h18"/>
diff --git a/res/core/resources/cart.xml b/res/core/resources/cart.xml
index af3860c9c..17dbdcb41 100644
--- a/res/core/resources/cart.xml
+++ b/res/core/resources/cart.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="cart">
   <item capacity="14000" weight="4000" score="60" vehicle="yes" big="yes">
-    <construction skill="cartmaking" minskill="1" reqsize="1">
+    <construction skill="cartmaking" minskill="1">
       <requirement type="log" quantity="5"/>
     </construction>
   </item>
diff --git a/res/core/resources/horse.xml b/res/core/resources/horse.xml
index abf6d856d..53699c696 100644
--- a/res/core/resources/horse.xml
+++ b/res/core/resources/horse.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="horse" limited="yes" material="rm_horse">
   <item big="yes" weight="5000" score="10" capacity="7000" animal="yes">
-    <construction skill="training" minskill="1" reqsize="1"/>
+    <construction skill="training" minskill="1"/>
     <function name="give" value="givehorses"/>
   </item>
   <resourcelimit>
diff --git a/res/core/resources/iron.xml b/res/core/resources/iron.xml
index 94dbc6390..7bc4cb428 100644
--- a/res/core/resources/iron.xml
+++ b/res/core/resources/iron.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="iron" limited="yes" material="rm_iron">
   <item weight="500" score="10">
-    <construction skill="mining" minskill="1" reqsize="1"/>
+    <construction skill="mining" minskill="1"/>
   </item>
   <resourcelimit>
     <modifier building="mine" type="skill" value="1"/>
diff --git a/res/core/resources/laen.xml b/res/core/resources/laen.xml
index efb13c5ed..571026a0a 100644
--- a/res/core/resources/laen.xml
+++ b/res/core/resources/laen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="laen" limited="yes" material="rm_laen">
   <item weight="200" score="100">
-    <construction skill="mining" minskill="7" reqsize="1"/>
+    <construction skill="mining" minskill="7"/>
   </item>
   <resourcelimit>
     <modifier type="require" building="mine"/>
diff --git a/res/core/resources/log.xml b/res/core/resources/log.xml
index c017682fc..012fe9a20 100644
--- a/res/core/resources/log.xml
+++ b/res/core/resources/log.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="log" material="rm_tree">
   <item weight="500" score="10">
-    <construction skill="forestry" minskill="1" reqsize="1"/>
+    <construction skill="forestry" minskill="1"/>
   </item>
   <resourcelimit>
     <modifier building="sawmill" type="skill" value="1"/>
diff --git a/res/core/resources/mallorn.xml b/res/core/resources/mallorn.xml
index e5c01506b..2d301758e 100644
--- a/res/core/resources/mallorn.xml
+++ b/res/core/resources/mallorn.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="mallorn" material="rm_mallorn">
   <item weight="500" score="30">
-    <construction skill="forestry" minskill="2" reqsize="1"/>
+    <construction skill="forestry" minskill="2"/>
   </item>
   <resourcelimit>
     <modifier building="sawmill" type="skill" value="1"/>
diff --git a/res/core/resources/mallornseed.xml b/res/core/resources/mallornseed.xml
index 1c7c1a800..7a5a0310f 100644
--- a/res/core/resources/mallornseed.xml
+++ b/res/core/resources/mallornseed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <resource name="mallornseed" limited="yes">
   <item weight="10" score="100">
-    <construction skill="herbalism" minskill="4" reqsize="1"/>
+    <construction skill="herbalism" minskill="4"/>
   </item>
 </resource>
diff --git a/res/core/resources/seed.xml b/res/core/resources/seed.xml
index 2193fb8c8..99f5f5804 100644
--- a/res/core/resources/seed.xml
+++ b/res/core/resources/seed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <resource name="seed" limited="yes">
   <item weight="10" score="50">
-    <construction skill="herbalism" minskill="3" reqsize="1"/>
+    <construction skill="herbalism" minskill="3"/>
   </item>
 </resource>
diff --git a/res/core/resources/stone.xml b/res/core/resources/stone.xml
index eed2fd2df..c227dcc5c 100644
--- a/res/core/resources/stone.xml
+++ b/res/core/resources/stone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="stone" limited="yes" material="rm_stone">
   <item weight="6000" score="10" big="yes">
-    <construction skill="quarrying" minskill="1" reqsize="1"/>
+    <construction skill="quarrying" minskill="1"/>
   </item>
   <resourcelimit>
     <modifier building="quarry" type="skill" value="1"/>
diff --git a/res/core/ships.xml b/res/core/ships.xml
index 0ce254328..fc87bc3d3 100644
--- a/res/core/ships.xml
+++ b/res/core/ships.xml
@@ -2,28 +2,28 @@
 <ships>
   <ship name="trireme" range="7" storm="1.00" damage="1.00" cargo="200000" cptskill="4" minskill="1" sumskill="120" opensea="yes">
     <coast terrain="plain"/>
-    <construction skill="shipcraft" minskill="4" maxsize="200" reqsize="1">
+    <construction skill="shipcraft" minskill="4" maxsize="200">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
 
   <ship name="caravel" range="5" storm="1.00" damage="1.00" cargo="300000" cptskill="3" minskill="1" sumskill="30" opensea="yes">
     <coast terrain="plain"/>
-    <construction skill="shipcraft" minskill="3" maxsize="250" reqsize="1">
+    <construction skill="shipcraft" minskill="3" maxsize="250">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
 
   <ship name="dragonship" range="5" storm="1.00" damage="1.00" cargo="100000" cptskill="2" minskill="1" sumskill="50" opensea="yes">
     <coast terrain="plain"/>
-    <construction skill="shipcraft" minskill="2" maxsize="100" reqsize="1">
+    <construction skill="shipcraft" minskill="2" maxsize="100">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
 
   <ship name="longboat" range="3" storm="1.00" damage="1.00" cargo="50000" cptskill="1" minskill="1" sumskill="10" opensea="yes">
     <coast terrain="plain"/>
-    <construction skill="shipcraft" minskill="1" maxsize="50" reqsize="1">
+    <construction skill="shipcraft" minskill="1" maxsize="50">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -39,7 +39,7 @@
     <coast terrain="activevolcano"/>
     <coast terrain="iceberg_sleep"/>
     <coast terrain="iceberg"/>
-    <construction skill="shipcraft" minskill="100" maxsize="5" reqsize="1"/>
+    <construction skill="shipcraft" minskill="100" maxsize="5"/>
   </ship>
 
   <ship name="boat" range="2" storm="1.00" damage="1.00" cargo="5000" cptskill="1" minskill="1" sumskill="2" opensea="yes">
@@ -53,7 +53,7 @@
     <coast terrain="activevolcano"/>
     <coast terrain="iceberg_sleep"/>
     <coast terrain="iceberg"/>
-    <construction skill="shipcraft" minskill="1" maxsize="5" reqsize="1">
+    <construction skill="shipcraft" minskill="1" maxsize="5">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -69,7 +69,7 @@
     <coast terrain="activevolcano"/>
     <coast terrain="iceberg_sleep"/>
     <coast terrain="iceberg"/>
-    <construction skill="shipcraft" minskill="100" maxsize="50" reqsize="1"/>
+    <construction skill="shipcraft" minskill="100" maxsize="50"/>
   </ship>
 
 </ships>
diff --git a/res/core/weapons/axe.xml b/res/core/weapons/axe.xml
index 7ee77b21e..80a872ad7 100644
--- a/res/core/weapons/axe.xml
+++ b/res/core/weapons/axe.xml
@@ -2,7 +2,7 @@
 <resource name="axe">
   <item weight="200">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="log" quantity="1"/>
       <requirement type="iron" quantity="1"/>
     </construction>
diff --git a/res/core/weapons/bow.xml b/res/core/weapons/bow.xml
index c64392966..4fb9b2000 100644
--- a/res/core/weapons/bow.xml
+++ b/res/core/weapons/bow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="bow">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="2" reqsize="1">
+    <construction skill="weaponsmithing" minskill="2">
       <requirement type="log" quantity="1"/>
     </construction>
     <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0">
diff --git a/res/core/weapons/catapult.xml b/res/core/weapons/catapult.xml
index 08dc83457..e05c5a025 100644
--- a/res/core/weapons/catapult.xml
+++ b/res/core/weapons/catapult.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="catapult">
   <item weight="10000" big="yes">
-    <construction skill="cartmaking" minskill="5" reqsize="1">
+    <construction skill="cartmaking" minskill="5">
       <requirement type="log" quantity="10"/>
     </construction>
     <weapon siege="true" bash="true" missile="true" skill="catapult" offmod="0" defmod="0" reload="5">
diff --git a/res/core/weapons/crossbow.xml b/res/core/weapons/crossbow.xml
index 318628b81..c7bf4715d 100644
--- a/res/core/weapons/crossbow.xml
+++ b/res/core/weapons/crossbow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="crossbow">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="log" quantity="1"/>
     </construction>
     <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
diff --git a/res/core/weapons/greatbow.xml b/res/core/weapons/greatbow.xml
index 542bd41a8..10b270e55 100644
--- a/res/core/weapons/greatbow.xml
+++ b/res/core/weapons/greatbow.xml
@@ -2,7 +2,7 @@
 <resource name="greatbow">
   <item weight="100">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <modifier function="mod_elves_only"/>
       <requirement type="mallorn" quantity="2"/>
     </construction>
diff --git a/res/core/weapons/greatsword.xml b/res/core/weapons/greatsword.xml
index 481ff680c..cd48b8296 100644
--- a/res/core/weapons/greatsword.xml
+++ b/res/core/weapons/greatsword.xml
@@ -2,7 +2,7 @@
 <resource name="greatsword">
   <item weight="200" score="30">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="4" reqsize="1">
+    <construction skill="weaponsmithing" minskill="4">
       <requirement type="iron" quantity="2"/>
     </construction>
     <weapon cut="true" skill="melee" offmod="-1" defmod="-2">
diff --git a/res/core/weapons/halberd.xml b/res/core/weapons/halberd.xml
index bf3fb4af7..5025f4793 100644
--- a/res/core/weapons/halberd.xml
+++ b/res/core/weapons/halberd.xml
@@ -2,7 +2,7 @@
 <resource name="halberd">
   <item weight="200">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="log" quantity="2"/>
       <requirement type="iron" quantity="1"/>
     </construction>
diff --git a/res/core/weapons/laensword.xml b/res/core/weapons/laensword.xml
index 31ec8b9e6..3053d5f1b 100644
--- a/res/core/weapons/laensword.xml
+++ b/res/core/weapons/laensword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="laensword">
   <item weight="100" score="400">
-    <construction skill="weaponsmithing" minskill="8" reqsize="1">
+    <construction skill="weaponsmithing" minskill="8">
       <requirement type="laen" quantity="1"/>
     </construction>
     <weapon cut="true" skill="melee" offmod="1" defmod="1" magres="0.30">
diff --git a/res/core/weapons/lance.xml b/res/core/weapons/lance.xml
index 1271c48f9..abbb7f31f 100644
--- a/res/core/weapons/lance.xml
+++ b/res/core/weapons/lance.xml
@@ -2,7 +2,7 @@
 <resource name="lance">
   <item weight="200">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="2" reqsize="1">
+    <construction skill="weaponsmithing" minskill="2">
       <requirement type="log" quantity="2"/>
     </construction>
     <weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
diff --git a/res/core/weapons/mallornbow.xml b/res/core/weapons/mallornbow.xml
index f61ea8e97..abdcc4810 100644
--- a/res/core/weapons/mallornbow.xml
+++ b/res/core/weapons/mallornbow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="mallornbow">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="1"/>
     </construction>
     <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.15">
diff --git a/res/core/weapons/mallorncrossbow.xml b/res/core/weapons/mallorncrossbow.xml
index fb7be26c0..385720d8c 100644
--- a/res/core/weapons/mallorncrossbow.xml
+++ b/res/core/weapons/mallorncrossbow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="mallorncrossbow">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="1"/>
     </construction>
     <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
diff --git a/res/core/weapons/mallornlance.xml b/res/core/weapons/mallornlance.xml
index 88973f3e0..0186143e4 100644
--- a/res/core/weapons/mallornlance.xml
+++ b/res/core/weapons/mallornlance.xml
@@ -2,7 +2,7 @@
 <resource name="mallornlance">
   <item weight="100">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="2"/>
     </construction>
     <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
diff --git a/res/core/weapons/mallornspear.xml b/res/core/weapons/mallornspear.xml
index 8c3782e4c..66d41a943 100644
--- a/res/core/weapons/mallornspear.xml
+++ b/res/core/weapons/mallornspear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="mallornspear">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="1"/>
     </construction>
     <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
diff --git a/res/core/weapons/rep_crossbow.xml b/res/core/weapons/rep_crossbow.xml
index 1e550a190..66e3f9fc2 100644
--- a/res/core/weapons/rep_crossbow.xml
+++ b/res/core/weapons/rep_crossbow.xml
@@ -2,7 +2,7 @@
 <resource name="rep_crossbow">
   <item weight="100">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <modifier function="mod_dwarves_only"/>
       <requirement type="log" quantity="1"/>
       <requirement type="iron" quantity="1"/>
diff --git a/res/core/weapons/rustyaxe.xml b/res/core/weapons/rustyaxe.xml
index 5399de62d..2ff19570c 100644
--- a/res/core/weapons/rustyaxe.xml
+++ b/res/core/weapons/rustyaxe.xml
@@ -2,7 +2,7 @@
 <resource name="rustyaxe">
   <item weight="200">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="log" quantity="1"/>
       <requirement type="iron" quantity="1"/>
     </construction>
diff --git a/res/core/weapons/rustygreatsword.xml b/res/core/weapons/rustygreatsword.xml
index ac1385b11..7f21cce17 100644
--- a/res/core/weapons/rustygreatsword.xml
+++ b/res/core/weapons/rustygreatsword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="rustygreatsword">
   <item weight="200" score="20">
-    <construction skill="weaponsmithing" minskill="4" reqsize="1">
+    <construction skill="weaponsmithing" minskill="4">
       <requirement type="iron" quantity="2"/>
     </construction>
     <weapon cut="true" skill="melee" offmod="-2" defmod="-3">
diff --git a/res/core/weapons/rustyhalberd.xml b/res/core/weapons/rustyhalberd.xml
index 4f237b989..c1b1f69a9 100644
--- a/res/core/weapons/rustyhalberd.xml
+++ b/res/core/weapons/rustyhalberd.xml
@@ -2,7 +2,7 @@
 <resource name="rustyhalberd">
   <item weight="200" score="20">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="iron" quantity="1"/>
       <requirement type="log" quantity="1"/>
     </construction>
diff --git a/res/core/weapons/rustysword.xml b/res/core/weapons/rustysword.xml
index f73dcd6e2..2a76c109b 100644
--- a/res/core/weapons/rustysword.xml
+++ b/res/core/weapons/rustysword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="rustysword">
   <item weight="100" score="10">
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="iron" quantity="1"/>
     </construction>
     <weapon cut="true" skill="melee" offmod="-1" defmod="-1">
diff --git a/res/core/weapons/spear.xml b/res/core/weapons/spear.xml
index c6479707a..32a79b9a2 100644
--- a/res/core/weapons/spear.xml
+++ b/res/core/weapons/spear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="spear">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="2" reqsize="1">
+    <construction skill="weaponsmithing" minskill="2">
       <requirement type="log" quantity="1"/>
     </construction>
     <weapon pierce="true" skill="polearm" offmod="0" defmod="0">
diff --git a/res/core/weapons/sword.xml b/res/core/weapons/sword.xml
index 0d3830e2e..4bd2ebdb1 100644
--- a/res/core/weapons/sword.xml
+++ b/res/core/weapons/sword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="sword">
   <item weight="100" score="30">
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="iron" quantity="1"/>
     </construction>
     <weapon cut="true" skill="melee">
diff --git a/res/e3a/armor/chainmail.xml b/res/e3a/armor/chainmail.xml
index 39743d754..509df07e6 100644
--- a/res/e3a/armor/chainmail.xml
+++ b/res/e3a/armor/chainmail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="chainmail">
   <item weight="200" score="90">
-    <construction skill="armorer" minskill="3" reqsize="1">
+    <construction skill="armorer" minskill="3">
       <requirement type="iron" quantity="2"/>
     </construction>
     <armor ac="2" penalty="0.10" projectile="0.0" magres="0.0"/>
diff --git a/res/e3a/armor/laenmail.xml b/res/e3a/armor/laenmail.xml
index d3b1dd533..f03add574 100644
--- a/res/e3a/armor/laenmail.xml
+++ b/res/e3a/armor/laenmail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="laenmail">
   <item weight="100" score="1000">
-    <construction skill="armorer" minskill="9" reqsize="1">
+    <construction skill="armorer" minskill="9">
       <requirement type="laen" quantity="2"/>
     </construction>
     <armor ac="3" penalty="0.0" projectile="0.10" magres="0.3" laen="yes" />
diff --git a/res/e3a/armor/laenshield.xml b/res/e3a/armor/laenshield.xml
index 1ce6216b2..8d003bccc 100644
--- a/res/e3a/armor/laenshield.xml
+++ b/res/e3a/armor/laenshield.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="laenshield">
   <item weight="0" score="1000">
-    <construction skill="armorer" minskill="7" reqsize="1">
+    <construction skill="armorer" minskill="7">
       <requirement type="laen" quantity="1"/>
     </construction>
     <armor ac="1" penalty="-0.10" magres="0.3" laen="yes" shield="yes" />
diff --git a/res/e3a/armor/plate.xml b/res/e3a/armor/plate.xml
index 550e83173..29cabbf1a 100644
--- a/res/e3a/armor/plate.xml
+++ b/res/e3a/armor/plate.xml
@@ -2,7 +2,7 @@
 <resource name="plate">
   <item weight="400" score="150">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="armorer" minskill="4" reqsize="1">
+    <construction skill="armorer" minskill="4">
       <requirement type="iron" quantity="4"/>
     </construction>
     <armor ac="3" penalty="0.15" projectile="0.10" magres="0.0"/>
diff --git a/res/e3a/armor/rustychainmail.xml b/res/e3a/armor/rustychainmail.xml
index ac2628c62..361564c76 100644
--- a/res/e3a/armor/rustychainmail.xml
+++ b/res/e3a/armor/rustychainmail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="rustychainmail">
   <item weight="200" score="30">
-    <construction skill="armorer" minskill="3" reqsize="1">
+    <construction skill="armorer" minskill="3">
       <requirement type="iron" quantity="3"/>
     </construction>
     <armor ac="1" penalty="0.20" magres="0.0"/>
diff --git a/res/e3a/armor/rustyshield.xml b/res/e3a/armor/rustyshield.xml
index 2becae180..d9d8a54ef 100644
--- a/res/e3a/armor/rustyshield.xml
+++ b/res/e3a/armor/rustyshield.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="rustyshield">
   <item weight="100" score="10">
-    <construction skill="armorer" minskill="2" reqsize="1">
+    <construction skill="armorer" minskill="2">
       <requirement type="iron" quantity="1"/>
     </construction>
     <armor ac="0" penalty="-0.05" magres="0.0" shield="yes"/>
diff --git a/res/e3a/armor/scale.xml b/res/e3a/armor/scale.xml
index 809d08bca..7039b4008 100644
--- a/res/e3a/armor/scale.xml
+++ b/res/e3a/armor/scale.xml
@@ -2,7 +2,7 @@
 <resource name="scale">
   <item weight="300" score="150">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="armorer" minskill="5" reqsize="1">
+    <construction skill="armorer" minskill="5">
       <modifier function="mod_dwarves_only"/>
       <requirement type="iron" quantity="2"/>
     </construction>
diff --git a/res/e3a/armor/shield.xml b/res/e3a/armor/shield.xml
index 9b4ad9174..5770711e2 100644
--- a/res/e3a/armor/shield.xml
+++ b/res/e3a/armor/shield.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="shield">
   <item weight="100" score="30">
-    <construction skill="armorer" minskill="2" reqsize="1">
+    <construction skill="armorer" minskill="2">
       <requirement type="iron" quantity="1"/>
     </construction>
     <armor ac="0" penalty="-0.10" magres="0.0" shield="yes"/>
diff --git a/res/e3a/armor/towershield.xml b/res/e3a/armor/towershield.xml
index 5a7edcabe..e80c03523 100644
--- a/res/e3a/armor/towershield.xml
+++ b/res/e3a/armor/towershield.xml
@@ -2,7 +2,7 @@
 <resource name="towershield">
   <item weight="200" score="60">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="armorer" minskill="4" reqsize="1">
+    <construction skill="armorer" minskill="4">
       <modifier function="mod_dwarves_only"/>
       <requirement type="iron" quantity="1"/>
     </construction>
diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml
index 231596dc6..8ca30d27d 100644
--- a/res/e3a/buildings.xml
+++ b/res/e3a/buildings.xml
@@ -3,24 +3,24 @@
 
   <xi:include href="config://default/buildings/castle-2.xml" />
 
-  <building name="watch" capacity="1" maxsize="10" fort="yes">
+  <building name="watch" capacity="1" fort="yes">
     <function name="name" value="fort_name"/>
     <function name="protection" value="building_protection"/>
     <function name="taxes" value="lua_building_taxes"/>
-    <construction skill="building" minskill="1" maxsize="5" reqsize="1" defense_bonus="0">
+    <construction skill="building" minskill="1" maxsize="5" defense_bonus="0">
+      <requirement type="log" quantity="1"/>
+    </construction>
+    <construction skill="building" minskill="2" maxsize="5" defense_bonus="1">
+      <requirement type="log" quantity="1"/>
+    </construction>
+    <construction skill="building" minskill="2" defense_bonus="2">
       <requirement type="log" quantity="1"/>
     </construction>
-	  <construction skill="building" minskill="2" maxsize="5" reqsize="1" defense_bonus="1">
-		  <requirement type="log" quantity="1"/>
-	  </construction>
-	  <construction skill="building" minskill="2" reqsize="1" defense_bonus="2">
-		  <requirement type="log" quantity="1"/>
-	  </construction>
   </building>
 
   <building name="market" capacity="1" maxsize="10">
     <maintenance type="money" amount="200" vital="yes"/>
-    <construction skill="building" minskill="3" reqsize="1">
+    <construction skill="building" minskill="3">
       <requirement type="log" quantity="1"/>
       <requirement type="stone" quantity="1"/>
     </construction>
diff --git a/res/e3a/items.xml b/res/e3a/items.xml
index 706bd0d67..7d7e6b286 100644
--- a/res/e3a/items.xml
+++ b/res/e3a/items.xml
@@ -71,7 +71,7 @@
 
   <resource name="charger">
     <item big="yes" weight="5000" score="10" capacity="7000" animal="yes">
-      <construction skill="training" minskill="4" reqsize="1">
+      <construction skill="training" minskill="4">
         <requirement type="money" quantity="200"/>
         <requirement type="iron" quantity="1"/>
         <requirement type="horse" quantity="1"/>
diff --git a/res/e3a/resources/iron.xml b/res/e3a/resources/iron.xml
index 3856c045d..b245da358 100644
--- a/res/e3a/resources/iron.xml
+++ b/res/e3a/resources/iron.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="iron" limited="yes" material="rm_iron">
   <item weight="500" score="10">
-    <construction skill="mining" minskill="1" reqsize="1"/>
+    <construction skill="mining" minskill="1"/>
   </item>
   <resourcelimit>
     <modifier building="mine" type="skill" value="1"/>
diff --git a/res/e3a/resources/stone.xml b/res/e3a/resources/stone.xml
index 854003c86..746b79c21 100644
--- a/res/e3a/resources/stone.xml
+++ b/res/e3a/resources/stone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="stone" limited="yes" material="rm_stone">
   <item weight="6000" score="10" big="yes">
-    <construction skill="quarrying" minskill="1" reqsize="1"/>
+    <construction skill="quarrying" minskill="1"/>
   </item>
   <resourcelimit>
     <modifier building="quarry" type="skill" value="1"/>
diff --git a/res/e3a/ships.xml b/res/e3a/ships.xml
index b8c5f0197..291900a3b 100644
--- a/res/e3a/ships.xml
+++ b/res/e3a/ships.xml
@@ -10,7 +10,7 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <construction skill="shipcraft" minskill="1" maxsize="3" reqsize="1">
+    <construction skill="shipcraft" minskill="1" maxsize="3">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -20,7 +20,7 @@
     <coast terrain="packice"/>
     <coast terrain="swamp"/>
     <coast terrain="desert"/>
-    <construction skill="shipcraft" minskill="1" maxsize="10" reqsize="1">
+    <construction skill="shipcraft" minskill="1" maxsize="10">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -35,7 +35,7 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <construction skill="shipcraft" minskill="2" maxsize="10" reqsize="1">
+    <construction skill="shipcraft" minskill="2" maxsize="10">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -50,7 +50,7 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <construction skill="shipcraft" minskill="2" maxsize="10" reqsize="1">
+    <construction skill="shipcraft" minskill="2" maxsize="10">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -66,7 +66,7 @@
     <coast terrain="glacier"/>
     <coast terrain="volcano"/>
     <coast terrain="activevolcano"/>
-    <construction skill="shipcraft" minskill="6" maxsize="10" reqsize="1">
+    <construction skill="shipcraft" minskill="6" maxsize="10">
       <requirement type="mallorn" quantity="1"/>
       <requirement type="money" quantity="100"/>
     </construction>
@@ -75,7 +75,7 @@
   <ship name="catamaran" range="7" storm="0.25" damage="1.00" cabins="22" cargo="10000" cptskill="7" minskill="1" sumskill="20" opensea="yes">
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="8" maxsize="30" reqsize="1">
+    <construction skill="shipcraft" minskill="8" maxsize="30">
       <requirement type="mallorn" quantity="1"/>
       <requirement type="money" quantity="100"/>
     </construction>
@@ -85,7 +85,7 @@
   <ship name="cog" range="4" storm="0.50" damage="1.00" cabins="50" cargo="200000" cptskill="4" minskill="1" sumskill="20" opensea="yes">
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="4" maxsize="100" reqsize="1">
+    <construction skill="shipcraft" minskill="4" maxsize="100">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -93,7 +93,7 @@
   <ship name="caravel" range="4" storm="0.50" damage="1.00" cabins="150" cargo="600000" cptskill="6" minskill="1" sumskill="30" opensea="yes">
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="6" maxsize="300" reqsize="1">
+    <construction skill="shipcraft" minskill="6" maxsize="300">
       <requirement type="log" quantity="1"/>
     </construction>
   </ship>
@@ -103,7 +103,7 @@
     <modifier type="defense" value="+2"/>
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="5" maxsize="100" reqsize="1">
+    <construction skill="shipcraft" minskill="5" maxsize="100">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
     </construction>
@@ -113,7 +113,7 @@
     <modifier type="defense" value="+2"/>
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="7" maxsize="300" reqsize="1">
+    <construction skill="shipcraft" minskill="7" maxsize="300">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
     </construction>
@@ -125,7 +125,7 @@
     <modifier type="tactics" factor="2.00"/>
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="5" maxsize="100" reqsize="1">
+    <construction skill="shipcraft" minskill="5" maxsize="100">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
     </construction>
@@ -136,7 +136,7 @@
     <modifier type="tactics" factor="2.00"/>
     <coast terrain="plain"/>
     <coast terrain="packice"/>
-    <construction skill="shipcraft" minskill="7" maxsize="300" reqsize="1">
+    <construction skill="shipcraft" minskill="7" maxsize="300">
       <requirement type="log" quantity="1"/>
       <requirement type="money" quantity="10"/>
     </construction>
diff --git a/res/e3a/weapons/crossbow.xml b/res/e3a/weapons/crossbow.xml
index 57535a070..7b2ed743c 100644
--- a/res/e3a/weapons/crossbow.xml
+++ b/res/e3a/weapons/crossbow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="crossbow">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="log" quantity="1"/>
     </construction>
     <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
diff --git a/res/e3a/weapons/greatbow.xml b/res/e3a/weapons/greatbow.xml
index ba91f54de..7f08427c8 100644
--- a/res/e3a/weapons/greatbow.xml
+++ b/res/e3a/weapons/greatbow.xml
@@ -6,7 +6,7 @@
 <resource name="greatbow">
   <item weight="100">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <modifier function="mod_elves_only"/>
       <requirement type="mallorn" quantity="2"/>
     </construction>
diff --git a/res/e3a/weapons/greatsword.xml b/res/e3a/weapons/greatsword.xml
index 5fc1c9042..5a199321d 100644
--- a/res/e3a/weapons/greatsword.xml
+++ b/res/e3a/weapons/greatsword.xml
@@ -4,7 +4,7 @@
 -->
 <resource name="greatsword">
   <item weight="200" score="30">
-    <construction skill="weaponsmithing" minskill="4" reqsize="1">
+    <construction skill="weaponsmithing" minskill="4">
       <requirement type="iron" quantity="2"/>
     </construction>
     <weapon useshield="false" cut="true" skill="melee" offmod="-1" defmod="-2" horse="false">
diff --git a/res/e3a/weapons/halberd.xml b/res/e3a/weapons/halberd.xml
index edb933701..2c11b62fc 100644
--- a/res/e3a/weapons/halberd.xml
+++ b/res/e3a/weapons/halberd.xml
@@ -5,7 +5,7 @@
 <resource name="halberd">
   <item weight="200">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="log" quantity="2"/>
       <requirement type="iron" quantity="1"/>
     </construction>
diff --git a/res/e3a/weapons/laensword.xml b/res/e3a/weapons/laensword.xml
index 13ebbf03e..50f824e8c 100644
--- a/res/e3a/weapons/laensword.xml
+++ b/res/e3a/weapons/laensword.xml
@@ -4,7 +4,7 @@
 -->
 <resource name="laensword">
   <item weight="100" score="400">
-    <construction skill="weaponsmithing" minskill="8" reqsize="1">
+    <construction skill="weaponsmithing" minskill="8">
       <requirement type="laen" quantity="1"/>
     </construction>
     <weapon cut="true" skill="melee" offmod="1" defmod="1" magres="0.30">
diff --git a/res/e3a/weapons/mallorncrossbow.xml b/res/e3a/weapons/mallorncrossbow.xml
index 920ae553f..86991bc10 100644
--- a/res/e3a/weapons/mallorncrossbow.xml
+++ b/res/e3a/weapons/mallorncrossbow.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="mallorncrossbow">
   <item weight="100">
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="1"/>
     </construction>
     <weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
diff --git a/res/e3a/weapons/mallornlance.xml b/res/e3a/weapons/mallornlance.xml
index 6355f5780..1fcad08c8 100644
--- a/res/e3a/weapons/mallornlance.xml
+++ b/res/e3a/weapons/mallornlance.xml
@@ -2,7 +2,7 @@
 <resource name="mallornlance">
   <item weight="100">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="5" reqsize="1">
+    <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="2"/>
     </construction>
     <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
diff --git a/res/e3a/weapons/rustygreatsword.xml b/res/e3a/weapons/rustygreatsword.xml
index 818fac553..607f16a6a 100644
--- a/res/e3a/weapons/rustygreatsword.xml
+++ b/res/e3a/weapons/rustygreatsword.xml
@@ -4,7 +4,7 @@
 -->
 <resource name="rustygreatsword">
   <item weight="200" score="20">
-    <construction skill="weaponsmithing" minskill="4" reqsize="1">
+    <construction skill="weaponsmithing" minskill="4">
       <requirement type="iron" quantity="2"/>
     </construction>
     <weapon useshield="false" cut="true" skill="melee" offmod="-2" defmod="-3" horse="false">
diff --git a/res/e3a/weapons/rustyhalberd.xml b/res/e3a/weapons/rustyhalberd.xml
index bab849b49..ed25d5db7 100644
--- a/res/e3a/weapons/rustyhalberd.xml
+++ b/res/e3a/weapons/rustyhalberd.xml
@@ -5,7 +5,7 @@
 <resource name="rustyhalberd">
   <item weight="200" score="20">
     <function name="canuse" value="lua_canuse_item"/>
-    <construction skill="weaponsmithing" minskill="3" reqsize="1">
+    <construction skill="weaponsmithing" minskill="3">
       <requirement type="iron" quantity="1"/>
       <requirement type="log" quantity="1"/>
     </construction>
diff --git a/res/ships/boat.xml b/res/ships/boat.xml
index 91852de92..551fea702 100644
--- a/res/ships/boat.xml
+++ b/res/ships/boat.xml
@@ -10,7 +10,7 @@
   <coast terrain="activevolcano"/>
   <coast terrain="iceberg_sleep"/>
   <coast terrain="iceberg"/>
-  <construction skill="shipcraft" minskill="1" maxsize="5" reqsize="1">
+  <construction skill="shipcraft" minskill="1" maxsize="5">
     <requirement type="log" quantity="1"/>
   </construction>
 </ship>
diff --git a/src/creport.c b/src/creport.c
index ab5813e8a..6ba9f5e39 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -1160,7 +1160,8 @@ int seemode, FILE * F)
                 }
             }
             if (cs) {
-                const char *bname = mkname("border", b->type->name(b, r, f, GF_PURE));
+                const char *bname = border_name(b, r, f, GF_PURE);
+                bname = mkname("border", bname);
                 fprintf(F, "GRENZE %d\n", ++g);
                 fprintf(F, "\"%s\";typ\n", LOC(default_locale, bname));
                 fprintf(F, "%d;richtung\n", d);
diff --git a/src/kernel/build.c b/src/kernel/build.c
index f3c74bf95..97e5e84d0 100644
--- a/src/kernel/build.c
+++ b/src/kernel/build.c
@@ -849,7 +849,6 @@ build_building(unit * u, const building_type * btype, int id, int want, order *
 
     b->size += built;
     if (b->type->maxsize > 0 && b->size > b->type->maxsize) {
-        // this seems to be okay for a watch, but is not okay for an academy or harbour
         log_error("build: %s has size=%d, maxsize=%d", buildingname(b), b->size, b->type->maxsize);
     }
     fset(b, BLD_EXPANDED);
diff --git a/src/kernel/building.c b/src/kernel/building.c
index f0e46cc7e..e7c60ea9a 100644
--- a/src/kernel/building.c
+++ b/src/kernel/building.c
@@ -132,7 +132,7 @@ int buildingcapacity(const building * b)
         }
         return b->size * b->type->capacity;
     }
-    if (b->size >= b->type->maxsize) {
+    if (building_finished(b)) {
         if (b->type->maxcapacity >= 0) {
             return b->type->maxcapacity;
         }
@@ -648,15 +648,20 @@ buildingtype_exists(const region * r, const building_type * bt, bool working)
     building *b;
 
     for (b = rbuildings(r); b; b = b->next) {
-        if (b->type == bt && b->size >= bt->maxsize && (!working || fval(b, BLD_WORKING)))
+        if (b->type == bt && (!working || fval(b, BLD_WORKING)) && building_finished(b)) {
             return true;
+        }
     }
 
     return false;
 }
 
+bool building_finished(const struct building *b) {
+    return b->size >= b->type->maxsize;
+}
+
 bool building_is_active(const struct building *b) {
-    return b && fval(b, BLD_WORKING)  && b->size >= b->type->maxsize;
+    return b && fval(b, BLD_WORKING) && building_finished(b);
 }
 
 building *active_building(const unit *u, const struct building_type *btype) {
diff --git a/src/kernel/building.h b/src/kernel/building.h
index 766242c4a..52b715c59 100644
--- a/src/kernel/building.h
+++ b/src/kernel/building.h
@@ -92,15 +92,7 @@ extern "C" {
         const struct building *b, int bsize);
 
     bool in_safe_building(struct unit *u1, struct unit *u2);
-    /* buildingt => building_type
-     * Name => locale_string(name)
-     * MaxGroesse => levels
-     * MinBauTalent => construction->minskill
-     * Kapazitaet => capacity, maxcapacity
-     * Materialien => construction->materials
-     * UnterSilber, UnterSpezialTyp, UnterSpezial => maintenance
-     * per_size => !maintenance->fixed
-     */
+
 #define BFL_NONE           0x00
 #define BLD_MAINTAINED     0x01 /* vital maintenance paid for */
 #define BLD_WORKING        0x02 /* full maintenance paid, it works */
@@ -138,6 +130,7 @@ extern "C" {
     struct region *r, const struct locale *lang);
     int build_building(struct unit *u, const struct building_type *typ,
         int id, int size, struct order *ord);
+    bool building_finished(const struct building *b);
 
     /* Alte Gebäudetypen: */
 
@@ -173,10 +166,6 @@ extern "C" {
     bool building_is_active(const struct building *b);
     struct building *active_building(const struct unit *u, const struct building_type *btype);
 
-#ifdef WDW_PYRAMID
-    extern int wdw_pyramid_level(const struct building *b);
-#endif
-
     extern const char *buildingname(const struct building *b);
 
     extern const char *building_getname(const struct building *b);
diff --git a/src/kernel/connection.c b/src/kernel/connection.c
index d9f1871d0..f1e5c4b6d 100644
--- a/src/kernel/connection.c
+++ b/src/kernel/connection.c
@@ -677,3 +677,7 @@ int read_borders(gamedata *data)
     }
     return 0;
 }
+
+const char * border_name(const connection *co, const struct region * r, const struct faction * f, int flags) {
+    return (co->type->name) ? co->type->name(co, r, f, flags) : co->type->__name;
+}
diff --git a/src/kernel/connection.h b/src/kernel/connection.h
index 2c0800849..7eef0f52a 100644
--- a/src/kernel/connection.h
+++ b/src/kernel/connection.h
@@ -148,6 +148,9 @@ extern "C" {
     /* game-specific callbacks */
     void(*border_convert_cb) (struct connection * con, struct attrib * attr);
 
+    const char * border_name(const struct connection *co,
+        const struct region * r, const struct faction * f, int flags);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/kernel/save.c b/src/kernel/save.c
index fd82bed96..2379db877 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -1676,6 +1676,7 @@ int read_game(gamedata *data) {
             if (b->type == bt_lighthouse) {
                 r->flags |= RF_LIGHTHOUSE;
             }
+
             // repairs, bug 2221:
             if (b->type->maxsize>0 && b->size>b->type->maxsize) {
                 log_error("building too big: %s (%s size %d of %d), fixing.", buildingname(b), b->type->_name, b->size, b->type->maxsize);
diff --git a/src/kernel/unit.c b/src/kernel/unit.c
index e41e5b006..09b3d80a9 100644
--- a/src/kernel/unit.c
+++ b/src/kernel/unit.c
@@ -1044,7 +1044,7 @@ struct building *inside_building(const struct unit *u)
     if (!u->building) {
         return NULL;
     }
-    else if (u->building->size < u->building->type->maxsize) {
+    else if (!building_finished(u->building)) {
         /* Gebaeude noch nicht fertig */
         return NULL;
     }
diff --git a/src/kernel/version.h b/src/kernel/version.h
index 7ef7d9c36..4aab16f5f 100644
--- a/src/kernel/version.h
+++ b/src/kernel/version.h
@@ -10,7 +10,7 @@
  without prior permission by the authors of Eressea.
  
  */
-#define INTPAK_VERSION 329      /* in binary, ints can get packed */
+#define INTPAK_VERSION 329      /* in binary, ints can get packed. starting with E2/572 */
 #define NOZEROIDS_VERSION 330   /* 2008-05-16 zero is not a valid ID for anything (including factions) */
 #define NOBORDERATTRIBS_VERSION 331     /* 2008-05-17 connection::attribs has been moved to userdata */
 #define UIDHASH_VERSION 332     /* 2008-05-22 borders use the region.uid to store */
diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index f4e5fd751..da8014d67 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -169,7 +169,7 @@ construction ** consPtr)
         con->skill = sk;
         con->maxsize = xml_ivalue(node, "maxsize", -1);
         con->minskill = xml_ivalue(node, "minskill", -1);
-        con->reqsize = xml_ivalue(node, "reqsize", -1);
+        con->reqsize = xml_ivalue(node, "reqsize", 1);
         con->defense_bonus = xml_ivalue(node, "defense_bonus", 0);
         con->close_combat_bonus = xml_ivalue(node, "close_combat_bonus", 0);
         con->ranged_bonus = xml_ivalue(node, "ranged_bonus", 0);
diff --git a/src/move.c b/src/move.c
index e7ca523b5..6c5950c1f 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1758,7 +1758,7 @@ unit *owner_buildingtyp(const region * r, const building_type * bt)
     for (b = rbuildings(r); b; b = b->next) {
         owner = building_owner(b);
         if (b->type == bt && owner != NULL) {
-            if (b->size >= bt->maxsize) {
+            if (building_finished(b)) {
                 return owner;
             }
         }
diff --git a/src/report.c b/src/report.c
index 15c5f1b2c..84b1291b2 100644
--- a/src/report.c
+++ b/src/report.c
@@ -915,7 +915,7 @@ static void describe(stream *out, const seen_region * sr, faction * f)
         for (b = get_borders(r, r2); b;) {
             struct edge *e = edges;
             bool transparent = b->type->transparent(b, f);
-            const char *name = b->type->name(b, r, f, GF_DETAILED | GF_ARTICLE);
+            const char *name = border_name(b, r, f, GF_DETAILED | GF_ARTICLE);
 
             if (!transparent)
                 see[d] = false;
@@ -1898,7 +1898,7 @@ const faction * f)
         }
     }
 
-    if (b->size < b->type->maxsize) {
+    if (!building_finished(b)) {
         bytes = (int)strlcpy(bufp, LOC(lang, "nr_building_inprogress"), size);
         if (wrptr(&bufp, &size, bytes) != 0)
             WARN_STATIC_BUFFER();
diff --git a/src/spells.c b/src/spells.c
index b93c373ae..1da440df2 100644
--- a/src/spells.c
+++ b/src/spells.c
@@ -975,7 +975,7 @@ static int sp_blessstonecircle(castorder * co)
         return 0;
     }
 
-    if (b->size < b->type->maxsize) {
+    if (!building_finished(b)) {
         ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order,
             "error_notcomplete", "building", b));
         return 0;
@@ -4502,11 +4502,11 @@ int sp_icastle(castorder * co)
     if (type == bt_illusion) {
         b->size = (rng_int() % (int)((power * power) + 1) * 10);
     }
-    else if (type->maxsize == -1) {
-        b->size = ((rng_int() % (int)(power)) + 1) * 5;
+    else if (type->maxsize >0) {
+        b->size = type->maxsize;
     }
     else {
-        b->size = type->maxsize;
+        b->size = ((rng_int() % (int)(power)) + 1) * 5;
     }
 
     if (type->name == NULL) {
diff --git a/src/wormhole.c b/src/wormhole.c
index 36e04e9e0..916c0509d 100644
--- a/src/wormhole.c
+++ b/src/wormhole.c
@@ -149,8 +149,7 @@ make_wormhole(const building_type * bt_wormhole, region * r1, region * r2)
     attrib *a2 = a_add(&b2->attribs, a_new(&at_wormhole));
     a1->data.v = b2->region;
     a2->data.v = b1->region;
-    b1->size = bt_wormhole->maxsize;
-    b2->size = bt_wormhole->maxsize;
+    b1->size = b2->size = bt_wormhole->maxcapacity * bt_wormhole->capacity;
     ADDMSG(&r1->msgs, msg_message("wormhole_appear", "region", r1));
     ADDMSG(&r2->msgs, msg_message("wormhole_appear", "region", r2));
 }