diff --git a/GameEngine/Message.php b/GameEngine/Message.php
index 231bc51f..d4434c9a 100644
--- a/GameEngine/Message.php
+++ b/GameEngine/Message.php
@@ -60,7 +60,8 @@
         				case "m5":
         					if(isset($post['delmsg_x'])) {
 							if($session->access!=BANNED){
-        						$this->removeMessage($post);
+							$this->removeMessage($post);
+							$this->header($get);
 						}else{
 						header("Location: banned.php");
 						}
@@ -115,6 +116,7 @@
         	}
 
         	public function procNotice($post) {
+			global $session;
         		if(isset($post["del_x"])) {
 				if($session->access != BANNED){
         			$this->removeNotice($post);
diff --git a/GameEngine/config.php b/GameEngine/config.php
new file mode 100644
index 00000000..a0e20654
--- /dev/null
+++ b/GameEngine/config.php
@@ -0,0 +1,252 @@
+<?php
+date_default_timezone_set("Asia/Jerusalem");
+###############################  S  T  A  R  T   ################################
+##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
+## --------------------------------------------------------------------------- ##
+##  Filename       config.php                                                  ##
+##  Version        4.8.5                                                       ##
+##  Developed by:  Dzoki and Dixie Edited by Advocaite                         ##
+##  License:       TravianX Project                                            ##
+##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
+##                                                                             ##
+#################################################################################
+
+//////////////////////////////////
+// *****  ERROR REPORTING  *****//
+//////////////////////////////////
+// (E_ALL ^ E_NOTICE) = enabled
+// (0) = disabled
+error_reporting (E_ALL ^ E_NOTICE);
+
+//////////////////////////////////
+// *****  SERVER SETTINGS  *****//
+//////////////////////////////////
+
+// ***** Name
+define("SERVER_NAME","TravianX");
+
+// ***** Started
+// Defines when has server started.
+define("COMMENCE","1333396699");
+
+// ***** Language
+// Choose your server language.
+define("LANG","en");
+
+// ***** Speed
+// Choose your server speed. NOTICE: Higher speed, more likely
+// to have some bugs. Lower speed, most likely no major bugs.
+// Values: 1 (normal), 3 (3x speed) etc...
+define("SPEED", "1000000");
+
+// ***** World size
+// Defines world size. NOTICE: DO NOT EDIT!!
+define("WORLD_MAX", "25");
+
+// ***** Graphic Pack
+// True = enabled, false = disabled
+//!!!!!!!!!!!! DO NOT ENABLE !!!!!!!!!!!!
+define("GP_ENABLE",false);
+// Graphic pack location (default: gpack/travian_default/)
+define("GP_LOCATE", "gpack/travian_default/");
+
+// ***** Troop Speed
+// Values: 1 (normal), 3 (3x speed) etc...
+define("INCREASE_SPEED","1000");
+
+// ***** Trader capacity
+// Values: 1 (normal), 3 (3x speed) etc...
+define("TRADER_CAPACITY","1");
+
+
+// ***** Village Expand
+// 1 = slow village expanding - more Cultural Points needed for every new village
+// 0 = fast village expanding - less Cultural Points needed for every new village
+define("CP", 1);
+
+// ***** Demolish Level Required
+// Defines which level of Main building is required to be able to
+// demolish. Min value = 1, max value = 20
+// Default: 10
+define("DEMOLISH_LEVEL_REQ","10");
+
+// ***** Change storage capacity
+define("STORAGE_MULTIPLIER","1");
+define("STORAGE_BASE",800*STORAGE_MULTIPLIER);
+
+// ***** Quest
+// Ingame quest enabled/disabled.
+define("QUEST",true);
+
+// ***** Beginners Protection
+// 3600 = 1 hour
+// 3600*12 = 12 hours
+// 3600*24 = 1 day
+// 3600*24*3 = 3 days
+// You can choose any value you want!
+define("PROTECTION","0");
+
+// ***** Enable WW Statistics
+define("WW",True);
+
+// ***** Activation Mail
+// true = activation mail will be sent, users will have to finish registration
+//        by clicking on link recieved in mail.
+// false =  users can register with any mail. Not needed to be real one.
+define("AUTH_EMAIL",false);
+
+// ***** PLUS
+//Plus account lenght
+define("PLUS_TIME",3600*24*7);
+//+25% production lenght
+define("PLUS_PRODUCTION",3600*24*7);
+// ***** Great Workshop
+define("GREAT_WKS",True);
+// ***** Tourn threshold
+define("TS_THRESHOLD",20);  
+
+
+
+//////////////////////////////////
+//    **** LOG SETTINGS  ****   //
+//////////////////////////////////
+// LOG BUILDING/UPGRADING
+define("LOG_BUILD",true);
+// LOG RESEARCHES
+define("LOG_TECH",true);
+// LOG USER LOGIN (IP's)
+define("LOG_LOGIN",true);
+// LOG GOLD
+define("LOG_GOLD_FIN",true);
+// LOG ADMIN
+define("LOG_ADMIN",true);
+// LOG ATTACK REPORTS
+define("LOG_WAR",true);
+// LOG MARKET REPORTS
+define("LOG_MARKET",true);
+// LOG ILLEGAL ACTIONS
+define("LOG_ILLEGAL",true);
+
+
+
+//////////////////////////////////
+// ****  NEWSBOX SETTINGS  **** //
+//////////////////////////////////
+//true = enabled
+//false = disabled
+define("NEWSBOX1",true);
+define("NEWSBOX2",false);
+define("NEWSBOX3",false);
+
+
+
+//////////////////////////////////
+//   ****  SQL SETTINGS  ****   //
+//////////////////////////////////
+
+// ***** SQL Hostname
+// example. sql106.000space.com / localhost
+// If you host server on own PC than this value is: localhost
+// If you use online hosting, value must be written in host cpanel
+define("SQL_SERVER", "localhost");
+
+// ***** Database Username
+define("SQL_USER", "root");
+
+// ***** Database Password
+define("SQL_PASS", "");
+
+// ***** Database Name
+define("SQL_DB", "travianx");
+
+// ***** Database - Table Prefix
+define("TB_PREFIX", "s1_");
+
+// ***** Database type
+// 0 = MYSQL
+// 1 = MYSQLi
+// default: 1
+define("DB_TYPE", 0);
+
+
+
+////////////////////////////////////
+//   ****  EXTRA SETTINGS  ****   //
+////////////////////////////////////
+
+// ***** Censore words
+//define("WORD_CENSOR", "%ACTCEN%");
+
+// ***** Words (censore)
+// Choose which words do you want to be censored
+//define("CENSORED","%CENWORDS%");
+
+
+// ***** Limit Mailbox
+// Limits mailbox to defined number of mails. (IGM's)
+define("LIMIT_MAILBOX",true);
+// If enabled, define number of maximum mails.
+define("MAX_MAIL","30");
+
+// ***** Include administrator in statistics/rank
+define("INCLUDE_ADMIN", True);
+
+
+
+////////////////////////////////////
+//   ****  ADMIN SETTINGS  ****   //
+////////////////////////////////////
+
+// ***** Admin Email
+define("ADMIN_EMAIL", "");
+
+// ***** Admin Name
+define("ADMIN_NAME", "");
+
+
+
+//////////////////////////////////////////
+//   ****  DO NOT EDIT SETTINGS  ****   //
+//////////////////////////////////////////
+define("TRACK_USR","");
+define("USER_TIMEOUT",""); 
+define("ALLOW_BURST",false);
+define("BASIC_MAX",1);
+define("INNER_MAX",1);
+define("PLUS_MAX",1);
+define("ALLOW_ALL_TRIBE",false);
+define("CFM_ADMIN_ACT",true);
+define("SERVER_WEB_ROOT",false);
+define("USRNM_SPECIAL",true);
+define("USRNM_MIN_LENGTH",3);
+define("PW_MIN_LENGTH",4);
+define("BANNED",0);
+define("AUTH",1);
+define("USER",2);
+define("MULTIHUNTER",8);
+define("ADMIN",9);
+define("COOKIE_EXPIRE", 60*60*24*7); 
+define("COOKIE_PATH", "/"); 
+
+
+////////////////////////////////////////////
+//   ****  DOMAIN/SERVER SETTINGS  ****   //
+////////////////////////////////////////////
+define("DOMAIN", "");
+define("HOMEPAGE", "http://localhost/");
+define("SERVER", "");
+
+$requse = 0;
+
+###############################  E    N    D   ##################################
+##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
+## --------------------------------------------------------------------------- ##
+##  Filename       config.php                                                  ##
+##  Version        4.8.5                                                       ##
+##  Developed by:  Dzoki and Dixie Edited by Advocaite                         ##
+##  License:       TravianX Project                                            ##
+##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
+##                                                                             ##
+#################################################################################
+
+?>
diff --git a/Templates/Alliance/Forum/forum_2.tpl b/Templates/Alliance/Forum/forum_2.tpl
index 8c4b9e41..cffc62c3 100644
--- a/Templates/Alliance/Forum/forum_2.tpl
+++ b/Templates/Alliance/Forum/forum_2.tpl
@@ -4,6 +4,16 @@ if($session->access!=BANNED){
 $displayarray = $database->getUserArray($session->uid,1);
 $forumcat = $database->ForumCat(htmlspecialchars($displayarray['alliance']));
 $forum_cat = $database->ForumCat;
+$ally = $session->alliance;
+$public = mysql_query("SELECT * FROM ".TB_PREFIX."forum_cat WHERE alliance = $ally AND forum_area = 1");
+$public1 = mysql_num_rows($public);
+$cofederation = mysql_query("SELECT * FROM ".TB_PREFIX."forum_cat WHERE alliance = $ally AND forum_area = 2");
+$cofederation1 = mysql_num_rows($cofederation);
+$alliance = mysql_query("SELECT * FROM ".TB_PREFIX."forum_cat WHERE alliance = $ally AND forum_area = 0");
+$alliance1 = mysql_num_rows($alliance);
+$closed = mysql_query("SELECT * FROM ".TB_PREFIX."forum_cat WHERE alliance = $ally AND forum_area = 3");
+$closed1 = mysql_num_rows($closed);
+if($public1 != 0){
 ?>
 <table cellpadding="1" cellspacing="1" id="public"><thead>
 		<tr>
@@ -53,6 +63,9 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 }
 ?>
 		</tbody></table>
+<?php
+}if($cofederation1 != 0){
+?>
 <table cellpadding="1" cellspacing="1" id="confederation"><thead>
 		<tr>
 	        <th colspan="4">Confederation Forum</th>
@@ -101,6 +114,9 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 }
 ?>
 		</tbody></table>
+<?php
+}if($alliance1 != 0){
+?>
 <table cellpadding="1" cellspacing="1" id="alliance"><thead>
 		<tr>
 	        <th colspan="4">Alliance Forum</th>
@@ -149,6 +165,9 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 }
 ?>
 		</tbody></table>
+<?php
+}if($closed1 != 0){
+?>
 <table cellpadding="1" cellspacing="1" id="closed"><thead>
 		<tr>
 	        <th colspan="4">Closed Forum</th>
@@ -196,7 +215,11 @@ echo '</td><td class="tit"><a href="allianz.php?s=2&fid='.$arr['id'].'&pid='.$ai
 }
 }
 ?>
-		</tbody></table><p>
+		</tbody></table>
+		<?php
+		}
+		?>
+		<p>
 		<?php
 			$opt = $database->getAlliPermissions($session->uid, $aid);
 			if($opt['opt5'] == 1){
diff --git a/Templates/Alliance/allidesc.tpl b/Templates/Alliance/allidesc.tpl
index 20eaadcd..30a59773 100644
--- a/Templates/Alliance/allidesc.tpl
+++ b/Templates/Alliance/allidesc.tpl
@@ -94,7 +94,7 @@ INDELING CATEGORIEEN:
         $titel="Defender of the Week";
         break;
     case "3":
-        $titel="Pop Climber of the week";
+        $titel="Climber of the week";
         break;
     case "4":
         $titel="Robber of the week";
diff --git a/install/data/sql.sql b/install/data/sql.sql
index 53604e1c..3ffe69e5 100644
--- a/install/data/sql.sql
+++ b/install/data/sql.sql
@@ -1258,6 +1258,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
   `ok` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `clp` bigint(255) NOT NULL DEFAULT '0',
   `oldrank` bigint(255) unsigned NOT NULL DEFAULT '0',
+  `regtime` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;