diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 96bb9ebf..e7dedc20 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -395,6 +395,14 @@ class Automation {
 					$database->addMovement(4,$enforce['vref'],$enforce['from'],$reference,$time,$time+$time2);
 					}
 				}
+				for($i=0;$i<20;$i++){
+				$q = "SELECT * FROM ".TB_PREFIX."users where friend".$i." = ".$need['uid']." or friend".$i."wait = ".$need['uid']."";
+				$array = $database->query_return($q);
+				foreach($array as $friend){
+				$database->deleteFriend($friend['id'],"friend".$i);
+				$database->deleteFriend($friend['id'],"friend".$i."wait");
+				}
+				}
 				$database->updateUserField($session->uid, 'alliance', 0, 1);
 				if($database->isAllianceOwner($need['uid'])){
 				$alliance = $database->getUserAllianceID($need['uid']);
diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php
index dea1e65c..4369d77f 100644
--- a/GameEngine/Ranking.php
+++ b/GameEngine/Ranking.php
@@ -171,15 +171,15 @@
 						return $key;
 						break;
 					} else {
-					if($field != "userid"){
 						if(!next($this->rankarray)) {
+						if($field != "userid"){
 							return $name;
 							break;
-						}
-					}else{
+						}else{
 							return 0;
 							break;
-					}
+						}
+						}
 					}
 				}
 			}
diff --git a/Templates/Build/upgrade.tpl b/Templates/Build/upgrade.tpl
index 46171c31..3e659c0d 100644
--- a/Templates/Build/upgrade.tpl
+++ b/Templates/Build/upgrade.tpl
@@ -78,8 +78,12 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
     	echo "<span class=\"none\">Upgrade Granary.</span>";
     }
     else if($bindicate == 7) {
+	if($village->allcrop > 0){
     	$neededtime = $building->calculateAvaliable($id,$village->resarray['f'.$id.'t'],1+$loopsame+$doublebuild+$master);
     	echo "<span class=\"none\">Enough resources ".$neededtime[0]." at  ".$neededtime[1]."</span>";
+	}else{
+		echo "<span class=\"none\">Your crop production is negative, you will never get the required resources.</span>";
+	}
 	if($session->goldclub == 1){
 ?>	</br>
 <?php
diff --git a/Templates/Build/wwupgrade.tpl b/Templates/Build/wwupgrade.tpl
index fcac1893..ddec728e 100644
--- a/Templates/Build/wwupgrade.tpl
+++ b/Templates/Build/wwupgrade.tpl
@@ -109,8 +109,12 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
     	echo "<span class=\"none\">Upgrade Granary.</span>";
     }
     else if($bindicate == 7) {
+	if($village->allcrop > 0){
     	$neededtime = $building->calculateAvaliable($id,$village->resarray['f'.$id.'t'],1+$loopsame+$doublebuild+$master);
     	echo "<span class=\"none\">Enough resources ".$neededtime[0]." at  ".$neededtime[1]."</span>";
+	}else{
+		echo "<span class=\"none\">Your crop production is negative, you will never get the required resources.</span>";
+	}
 	if($session->goldclub == 1){
 ?>	</br>
 <?php
diff --git a/Templates/a2b/startRaid.tpl b/Templates/a2b/startRaid.tpl
index 945b8473..46593a28 100644
--- a/Templates/a2b/startRaid.tpl
+++ b/Templates/a2b/startRaid.tpl
@@ -4,10 +4,10 @@
     $lid = $_POST['lid'];
     $tribe = $_POST['tribe'];
     $getFLData = $database->getFLData($lid);
-    $unitslist = $database->getFLData($lid);
-    $sql = mysql_query("SELECT * FROM ".TB_PREFIX."raidlist WHERE lid = ".$lid."");
+    $sql = "SELECT * FROM ".TB_PREFIX."raidlist WHERE lid = ".$lid." order by id asc";
+	$array = $database->query_return($sql);
+    foreach($array as $row){
 	$sql1 = mysql_fetch_array(mysql_query("SELECT * FROM ".TB_PREFIX."units WHERE vref = ".$getFLData['wref']));
-    while($row = mysql_fetch_array($sql)){
         $sid = $row['id'];
         $wref = $row['towref'];
         $t1 = $row['t1'];$t2 = $row['t2'];$t3 = $row['t3'];$t4 = $row['t4'];$t5 = $row['t5'];