diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index d504c4a8..00fcba54 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -1678,7 +1678,7 @@ class MYSQLi_DB implements IDbConnection {
                                 }
                                 break;
 
-                        case 3: if ($value['owner'] == $vid && $value['capital'] == 1) {
+                        case 3: if ((isset($value['owner']) && isset($value['capital'])) && $value['owner'] == $vid && $value['capital'] == 1) {
                                     return $value;
                                 }
                                 break;
@@ -1724,7 +1724,7 @@ class MYSQLi_DB implements IDbConnection {
 
             // by owner ID and capital = 1
             case 3: $vid = (int) $vid;
-                    $q = "SELECT * FROM " . TB_PREFIX . "vdata WHERE owner = $vid capital = 1 LIMIT 1";
+                    $q = "SELECT * FROM " . TB_PREFIX . "vdata WHERE owner = $vid AND capital = 1 LIMIT 1";
                     break;
 
             // by owner = Taskmaster
diff --git a/Templates/res.tpl b/Templates/res.tpl
index c256560b..fb5d3a98 100644
--- a/Templates/res.tpl
+++ b/Templates/res.tpl
@@ -1,4 +1,4 @@
-<?php 
+<?php
 #################################################################################
 ##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
 ## --------------------------------------------------------------------------- ##
@@ -11,12 +11,14 @@
 ?>
 
 <?php
-$wood = round($village->getProd("wood"));
-$clay = round($village->getProd("clay"));
-$iron = round($village->getProd("iron"));
-$crop = round($village->getProd("crop"));
-$totalproduction = $village->allcrop; // all crops + bakery + grain mill
-?> 
+// Natars cration script does not have village initialized
+if (!empty($village)) {
+    $wood            = round( $village->getProd( "wood" ) );
+    $clay            = round( $village->getProd( "clay" ) );
+    $iron            = round( $village->getProd( "iron" ) );
+    $crop            = round( $village->getProd( "crop" ) );
+    $totalproduction = $village->allcrop; // all crops + bakery + grain mill
+?>
 
 <div id="res">
 <div id="resWrap">
@@ -36,18 +38,18 @@ $totalproduction = $village->allcrop; // all crops + bakery + grain mill
 				<td title="<?php echo $crop; ?>"><?php echo "0/".$village->maxcrop; ?></td>
 							<?php } ?>
 							<td><img src="img/x.gif" class="r5" alt="<?php echo CROP_COM; ?>" title="<?php echo CROP_COM; ?>" /></td>
-			<td><?php echo ($village->pop+$technology->getUpkeep($village->unitall,0))."/".$totalproduction.""; ?></td>
+			<td><?php echo $village->pop+$technology->getUpkeep($village->unitall,0))."/".$totalproduction.""; ?></td>
 		</tr>
 	</table>
 	<table cellpadding="1" cellspacing="1">
 		<tr>
-        
+
 				<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
                 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
                 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-                <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td> 
+                <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
         <td></td>
-			<td><?php 
+			<td><?php
 			if($session->gold <= 1){
             echo '<font color="#B3B3B3"><img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Remaining gold" title="You currently have: '.$session->gold.' gold"/> '.$session->gold.' <span><span>G</span><span>o</span><span>l</span><span>d</span></span></font>';
 			}
@@ -56,11 +58,13 @@ $totalproduction = $village->allcrop; // all crops + bakery + grain mill
 			}
 			?>
 			</td>
-            
-            
-            
-				
+
+
+
+
 		</tr>
 	</table>
     </div>
-</div>
\ No newline at end of file
+</div>
+<?php
+}
\ No newline at end of file
diff --git a/Templates/text.tpl b/Templates/text.tpl
index 3efb5a41..7fcae382 100644
--- a/Templates/text.tpl
+++ b/Templates/text.tpl
@@ -10,34 +10,36 @@
 #################################################################################
 
 
-$txt="World Wonder Construction Plans 
-
-
-Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. 
-
-However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). 
-
-Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. 
-
-Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. 
-
-In the end, we will see whether the free tribes of Travian can once again outwit the Natars and vanquish them once and for all. Do not be so foolish as to assume that the Natars will leave without a fight, though!
+$txt="Construction plans
 
 
 
-To steal a set of Construction Plans from the Natars, the following things must happen:
-- You must Attack the village (NOT Raid!)
-- You must WIN the Attack
-- You must DESTROY the Treasure Chamber (Treasury)
-- Your Hero MUST be in that attack, as he is the only one who may carry the Construction Plans
-- An empty level 10 Treasure Chamber (Treasury) MUST be in the village where that attack came from
-NOTE: If the above criteria is not met during the attack, the next attack on that village which does meet the above criteria will take the Construction Plans.
+Countless days have passed since the first battles upon the walls of the cursed villages of the Dread Natars, many armies of both the free ones and the Natarian empire struggled and died before the walls of the many strongholds from which the Natars had once ruled all creation. Now with the dust settled and a relative calm having settled in, armies began to count their losses and collect their dead, the stench of combat still lingering in the night air, a smell of a slaughter unforgettable in its extent and brutality yet soon to be dwarfed by yet others. The largest armies of the free ones and the Dread Natars were marshalling for yet another renewed assault upon the coveted former strongholds of the Natarian Empire.
+
+Soon scouts arrived telling of a most awesome sight and a chilling reminder, a dread army of an unfathomable size had been spotted marshalling at the end of the world, the Natarian capital, a force so great and unstoppable that the dust from their march would choke off all light, a force so brutal and ruthless that it would crush all hope. The free people knew that they had to race now, race against time and the endless hordes of the Natarian Empire to raise a Wonder of the World to restore the world to peace and vanquish the Natarian threat.
+
+But to raise such a great Wonder would be no easy task, one would need construction plans created in the distant past, plans of such an arcane nature that even the very wisest of sages knew not their contents or locations.
+
+Tens of thousands of scouts roamed across all existence searching in vain for these mystical plans, looking in all places but the dreaded Natarian Capital, yet could not find them. Today however, they return bearing good news, they return baring the locations of the plans, hidden by the armies of the Natars inside secret strongholds constructed to be hidden from the eyes of man.
+
+Now begins the final stretch, when the greatest armies of the Free people and the Natars will clash across the world for the fate of all that lies under heaven. This is the war that will echo across the eons, this is your war, and here you shall etch your name across history, here you shall become legend.
 
 
+Facts:
+To steal one, the following things must happen:
+You must attack the village (NO Raid!)
+WIN the Attack
+Destroy the treasury
+An empty treasury lvl 10 MUST be in the village where that attack came from
+Have a hero in an attack
 
-To build a Treasure Chamber (Treasury), you will need a Main Building level 10 and the village MUST NOT be  contain a World Wonder.
+If not, the next attack on that village, winning with a hero and empty treasury will take the building plan.
 
-To build a World Wonder, you must own the Construction Plans yourself (you = the World Wonder Village Owner) from level 0 to 50, and then from level 51 to 100 you will need an additional set of Construction Plans in your Alliance! Two sets of Construction Plans in the World Wonder Village Account will not work!";
+To build a WW, you must own a plan yourself (you = the WW village owner) from lvl 0 to 50, from 51 to 100 you need an additional plan in your alliance! Two plans in the WW village account would not work!
+
+The construction plans are conquerable immediately when they appear to the server. 
+
+There will be a countdown in game, showing the exact time of the release, 5 days prior to the launch. ";
 
 //bbcode = html code
 $txt = preg_replace("/\[b\]/is",'<b>', $txt);