diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php
index 7eb93b85..27b8a157 100755
--- a/GameEngine/Ranking.php
+++ b/GameEngine/Ranking.php
@@ -5,7 +5,9 @@
 +---------------------------------------------------------+
 | Credits:     All the developers including the leaders:  |
 |              Advocaite & Dzoki & Donnchadh              |
-|                                                         |
+|														  |
+| Clean some bullshit : Shadow                            |
+|														  |
 | Copyright:   TravianZ Project All rights reserved       |
 \** --------------------------------------------------- **/
 
@@ -19,24 +21,16 @@
 			}
 
 			public function getUserRank($id) {
-			    global $database;   
 				$ranking = $this->getRank();
-				$users = "SELECT Count(*) as Total FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8");
-				$users2 = mysqli_fetch_array(mysqli_query($database->dblink,$users), MYSQLI_ASSOC);
-				$users2 = $users2['Total'];
-				$users3 = $users2 + 1;
-				$myrank = 0;
-				if(count($ranking) > 0) {
-					for($i = 0;$i < $users3; $i++) {
-						if( isset( $ranking[$i]['userid'] ) ) {
-							if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") {
-								$myrank = $i;
-							}
-						}
+					if(count($ranking) > 0) {
+					foreach($ranking as $key => $row) {
+					if($row != "pad" && isset($row['userid']) && $row['userid'] == $id) {
+					return $key;
 					}
 				}
-				return $myrank;
 			}
+			return 0;
+		}
 
 			public function procRankReq($get) {
 				global $village, $session;
@@ -178,7 +172,7 @@
 
 			public function getAllianceRank($id) {
 				$this->procARankArray();
-				while(1) {
+				while(true) {
 					if(count($this->rankarray) > 1) {
 						$key = key($this->rankarray);
 						if(isset ($this->rankarray[$key]["id"]) && $this->rankarray[$key]["id"] === $id) {
@@ -197,19 +191,20 @@
 			}
 
 			public function searchRank($name, $field) {
-			    
-			    while(1) {
-			        for($key = 0; $key < count($this->rankarray); $key++){
-			            if($this->rankarray[$key]!="pad") {
-			                if($this->rankarray[$key][$field] == $name) return $key;
-			            }
-			        }
-			        if(!next($this->rankarray)) {
-			            if($field != "userid") return $name;    
-			            else return 0;
-			        }
-			        
-			    }
+				$count = count($this->rankarray);
+				for ($key = 1; $key < $count; $key++) {
+					if (!isset($this->rankarray[$key]) || $this->rankarray[$key] === "pad") {
+					continue;
+				}
+					if (isset($this->rankarray[$key][$field]) &&
+					$this->rankarray[$key][$field] == $name) {
+					return $key;
+				}
+			}
+					if ($field != "userid") {
+					return $name;
+			}
+					return 0;
 			}
 
 			public function procRankArray() {
@@ -217,52 +212,34 @@
 				
 				if($GLOBALS['db']->countUser() > 0){
 				$holder = array();
-				if(SHOW_NATARS == True){
-					$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.oldrank oldrank, " . TB_PREFIX . "users.alliance alliance, (
-					SELECT SUM( " . TB_PREFIX . "vdata.pop )
-					FROM " . TB_PREFIX . "vdata
-					WHERE " . TB_PREFIX . "vdata.owner = userid
-					)totalpop, (
-					SELECT COUNT( " . TB_PREFIX . "vdata.wref )
-					FROM " . TB_PREFIX . "vdata
-					WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
-					)totalvillages, (
-					SELECT " . TB_PREFIX . "alidata.tag
-					FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
-					WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
-					AND " . TB_PREFIX . "users.id = userid
-					)allitag
-					FROM " . TB_PREFIX . "users
-					WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
-					AND (" . TB_PREFIX . "users.tribe <= 5 OR " . TB_PREFIX . "users.tribe = 5)
-                    AND (" . TB_PREFIX . "users.id > 5 OR " . TB_PREFIX . "users.id = 3)
-                    ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
-				} else {
-					$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.oldrank oldrank, " . TB_PREFIX . "users.alliance alliance, (
-					SELECT SUM( " . TB_PREFIX . "vdata.pop )
-					FROM " . TB_PREFIX . "vdata
-					WHERE " . TB_PREFIX . "vdata.owner = userid
-					)totalpop, (
-					SELECT COUNT( " . TB_PREFIX . "vdata.wref )
-					FROM " . TB_PREFIX . "vdata
-					WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
-					)totalvillages, (
-					SELECT " . TB_PREFIX . "alidata.tag
-					FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
-					WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
-					AND " . TB_PREFIX . "users.id = userid
-					)allitag
-					FROM " . TB_PREFIX . "users
-					WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
-					AND " . TB_PREFIX . "users.tribe <= 3
-                    AND " . TB_PREFIX . "users.id > 5
-                    ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
-				}
-
-				$datas = [];
+				$tribeCondition = SHOW_NATARS ? "(u.tribe <= 5) AND (u.id > 5 OR u.id = 3)" : "u.tribe <= 3 AND u.id > 5";
+				$q = "
+				SELECT
+				u.id AS userid,
+				u.username,
+				u.oldrank,
+				u.alliance,
+				a.tag AS allitag,
+				SUM(v.pop) AS totalpop,
+				COUNT(CASE WHEN v.type != 99 THEN v.wref END) AS totalvillages
+				FROM " . TB_PREFIX . "users u
+				LEFT JOIN " . TB_PREFIX . "vdata v
+				ON v.owner = u.id
+				LEFT JOIN " . TB_PREFIX . "alidata a
+				ON a.id = u.alliance
+				WHERE
+				u.access < " . (INCLUDE_ADMIN ? 10 : 8) . "
+				AND $tribeCondition
+				GROUP BY
+				u.id
+				ORDER BY
+				totalpop DESC,
+				totalvillages DESC,
+				u.id DESC";
 				$result = (mysqli_query($database->dblink,$q));
-				while($row = mysqli_fetch_assoc($result)) $datas[] = $row;
-
+				$datas = [];
+				while($row = mysqli_fetch_assoc($result)) 
+				$datas[] = $row;
 				if (count($datas)) {
 					foreach($datas as $result) {
 						$value['userid'] = $result['userid'];
@@ -272,14 +249,12 @@
 						$value['aname'] = $result['allitag'];
 						$value['totalpop'] = $result['totalpop'];
 						$value['totalvillage'] = $result['totalvillages'];
-						array_push($holder, $value);
+						$holder[] = $value;
 					}
 				}
-
 				$newholder = ["pad"];
 				foreach($holder as $key) array_push($newholder, $key);
 				$this->rankarray = $newholder;
-				
 			    }
 			}
 
@@ -287,39 +262,24 @@
 				global $multisort, $database;
 				$race = $database->escape((int) $race);
 				$holder = array();
-				$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.tribe tribe, " . TB_PREFIX . "users.username username," . TB_PREFIX . "users.alliance alliance, (
-
-			SELECT SUM( " . TB_PREFIX . "vdata.pop )
-			FROM " . TB_PREFIX . "vdata
-			WHERE " . TB_PREFIX . "vdata.owner = userid
-			)totalpop, (
-			SELECT COUNT( " . TB_PREFIX . "vdata.wref )
-			FROM " . TB_PREFIX . "vdata
-			WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
-			)totalvillages, (
-			SELECT " . TB_PREFIX . "alidata.tag
-			FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
-			WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
-			AND " . TB_PREFIX . "users.id = userid
-			)allitag
-			FROM " . TB_PREFIX . "users
-			WHERE " . TB_PREFIX . "users.tribe = $race AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
-            AND " . TB_PREFIX . "users.id > 5
-			ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
-
+				$q = "SELECT u.id AS userid, u.tribe, u.username, u.alliance, COALESCE(SUM(v.pop),0) AS totalpop, COUNT(CASE WHEN v.type != 99 THEN v.wref END) AS totalvillages, a.tag AS allitag
+				FROM " . TB_PREFIX . "users u LEFT JOIN " . TB_PREFIX . "vdata v ON v.owner = u.id LEFT JOIN " . TB_PREFIX . "alidata a ON a.id = u.alliance
+				WHERE u.tribe = $race
+				AND u.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND u.id > 5 GROUP BY u.id ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
 				$result = (mysqli_query($database->dblink,$q));
+				$datas = [];
 				while($row = mysqli_fetch_assoc($result)) {
-					$datas[] = $row;
+				$datas[] = $row;
 				}
-				if(mysqli_num_rows($result)) {
+				if(!empty($datas)) {
 					foreach($datas as $result) {
 						$value['userid'] = $result['userid'];
 						$value['username'] = $result['username'];
 						$value['alliance'] = $result['alliance'];
 						$value['aname'] = $result['allitag'];
 						$value['totalpop'] = $result['totalpop'];
-						$value['totalvillage'] = $result['totalvillages'];
-						array_push($holder, $value);
+						$value['totalvillage'] = $result['totalvillages'];					
+						$holder[] = $value;
 					}
 				} else {
 					$value['userid'] = 0;
@@ -328,7 +288,7 @@
 					$value['aname'] = "";
 					$value['totalpop'] = "";
 					$value['totalvillage'] = "";
-					array_push($holder, $value);
+					$holder[] = $value;
 				}
 				$newholder = array("pad");
 				foreach($holder as $key) {
@@ -340,21 +300,13 @@
 			public function procAttRankArray() {
 				global $multisort, $database;
 				$holder = array();
-				$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.apall,  (
-			SELECT COUNT( " . TB_PREFIX . "vdata.wref )
-			FROM " . TB_PREFIX . "vdata
-			WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
-			)totalvillages, (
-			SELECT SUM( " . TB_PREFIX . "vdata.pop )
-			FROM " . TB_PREFIX . "vdata
-			WHERE " . TB_PREFIX . "vdata.owner = userid
-			)pop
-			FROM " . TB_PREFIX . "users
-			WHERE " . TB_PREFIX . "users.apall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3
-            AND " . TB_PREFIX . "users.id > 5
-			ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, userid DESC";
+			$q = "SELECT u.id AS userid, u.username, u.apall, COUNT(CASE WHEN v.type != 99 THEN v.wref END) AS totalvillages, COALESCE(SUM(v.pop),0) AS pop
+			FROM " . TB_PREFIX . "users u LEFT JOIN " . TB_PREFIX . "vdata v ON v.owner = u.id
+			WHERE u.apall >= 0 AND u.access < " . (INCLUDE_ADMIN ? 10 : 8) . " AND u.tribe <= 3 AND u.id > 5
+			GROUP BY u.id ORDER BY u.apall DESC, pop DESC, u.id DESC";
 				$result = mysqli_query($database->dblink,$q) or die(mysqli_error($database->dblink));
-				while($row = mysqli_Fetch_assoc($result)) {
+				$datas = [];
+				while($row = mysqli_fetch_assoc($result)) {
 					$datas[] = $row;
 				}
 				foreach($datas as $key => $row) {
@@ -364,8 +316,7 @@
 					$value['id'] = $row['userid'];
 					$value['totalpop'] = $row['pop'];
 					$value['apall'] = $row['apall'];
-					array_push($holder, $value);
-					printf("\n<!-- %s %s %s %s -->\n", $value['username'], $value['totalvillages'], $value['totalpop'], $value['apall']);
+					$holder[] = $value;
 				}
 				$newholder = array("pad");
 				foreach($holder as $key) {
@@ -377,21 +328,13 @@
 			public function procDefRankArray() {
 			    global $database;
 				$holder = array();
-				$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.dpall,  (
-			SELECT COUNT( " . TB_PREFIX . "vdata.wref )
-			FROM " . TB_PREFIX . "vdata
-			WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
-			)totalvillages, (
-			SELECT SUM( " . TB_PREFIX . "vdata.pop )
-			FROM " . TB_PREFIX . "vdata
-			WHERE " . TB_PREFIX . "vdata.owner = userid
-			)pop
-			FROM " . TB_PREFIX . "users
-			WHERE " . TB_PREFIX . "users.dpall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3
-            AND " . TB_PREFIX . "users.id > 5
-			ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC, userid DESC";
+			$q = "SELECT u.id AS userid, u.username, u.dpall, COUNT(CASE WHEN v.type != 99 THEN v.wref END) AS totalvillages, COALESCE(SUM(v.pop),0) AS pop
+			FROM " . TB_PREFIX . "users u LEFT JOIN " . TB_PREFIX . "vdata v ON v.owner = u.id
+			WHERE u.dpall >= 0 AND u.access < " . (INCLUDE_ADMIN ? 10 : 8) . " AND u.tribe <= 3 AND u.id > 5
+			GROUP BY u.id ORDER BY u.dpall DESC, pop DESC, u.id DESC";
 				$result = mysqli_query($database->dblink,$q) or die(mysqli_error($database->dblink));
-				while($row = mysqli_Fetch_assoc($result)) {
+				$datas = [];
+				while($row = mysqli_fetch_assoc($result)) {
 					$datas[] = $row;
 				}
 				foreach($datas as $key => $row) {
@@ -401,8 +344,7 @@
 					$value['id'] = $row['userid'];
 					$value['totalpop'] = $row['pop'];
 					$value['dpall'] = $row['dpall'];
-					array_push($holder, $value);
-
+					$holder[] = $value;
 				}
 				$newholder = array("pad");
 				foreach($holder as $key) {
@@ -420,8 +362,7 @@
 					$value['x'] = $coor['x'];
 					$value['y'] = $coor['y'];
 					$value['user'] = $GLOBALS['db']->getUserField($value['owner'], "username", 0);
-
-					array_push($holder, $value);
+					$holder[] = $value;
 				}
 				$holder = $multisort->sorte($holder, "x", true, 2, "y", true, 2, "pop", false, 2);
 				$newholder = array("pad");
@@ -443,7 +384,6 @@
                         $memberIDs[] = $member['id'];
                     }
                     $data = $database->getVSumField($memberIDs,"pop");
-
                     if (count($data)) {
                         foreach ($data as $row) {
                             $totalpop += $row['Total'];
@@ -452,11 +392,11 @@
 					$value['players'] = count($memberlist);
 					$value['totalpop'] = $totalpop;
 					if(!isset($value['avg'])) {
-						$value['avg'] = @round($totalpop / count($memberlist));
+						$value['avg'] = (count($memberlist) > 0) ? round($totalpop / count($memberlist)) : 0;
 					} else {
 						$value['avg'] = 0;
 					}
-					array_push($holder, $value);
+					$holder[] = $value;
 				}
 				$holder = $multisort->sorte($holder, "totalpop", false, 2);
 				$newholder = array("pad");
@@ -475,7 +415,7 @@
 					$value['level'];
 					$value['name'];
 					$value['uid'];
-					array_push($holder, $value);
+					$holder[] = $value;
 				}
 				$holder = $multisort->sorte($holder, "experience", false, 2);
 				$newholder = array("pad");
@@ -493,16 +433,16 @@
 					$memberlist = $GLOBALS['db']->getAllMember($value['id']);
 					$totalap = 0;
 					foreach($memberlist as $member) {
-					$totalap += $member['ap'];
+						$totalap += $member['ap'];
 					}
 					$value['players'] = count($memberlist);
 					$value['totalap'] = $totalap;
 					if($value['avg'] > 0) {
-						$value['avg'] = round($totalap / count($memberlist));
+					$value['avg'] = ($totalap > 0 && count($memberlist) > 0) ? round($totalap / count($memberlist)) : 0;
 					} else {
 						$value['avg'] = 0;
 					}
-					array_push($holder, $value);
+					$holder[] = $value;
 				}
 				$holder = $multisort->sorte($holder, "Aap", false, 2);
 				$newholder = array("pad");
@@ -525,11 +465,11 @@
 					$value['players'] = count($memberlist);
 					$value['totaldp'] = $totaldp;
 					if($value['avg'] > 0) {
-						$value['avg'] = round($totalap / count($memberlist));
+					$value['avg'] = ($totaldp > 0 && count($memberlist) > 0) ? round($totaldp / count($memberlist)) : 0;
 					} else {
 						$value['avg'] = 0;
 					}
-					array_push($holder, $value);
+					$holder[] = $value;
 				}
 				$holder = $multisort->sorte($holder, "Adp", false, 2);
 				$newholder = array("pad");