diff --git a/Admin/Templates/editServerSet.tpl b/Admin/Templates/editServerSet.tpl
index 543ff514..4e0515cb 100644
--- a/Admin/Templates/editServerSet.tpl
+++ b/Admin/Templates/editServerSet.tpl
@@ -63,12 +63,12 @@ function refresh(tz) {
                                 <option value="en" <?php if (LANG=="en") echo "selected";?>>English</option>
                                <option value="nl" <?php if (LANG=="nl") echo "selected";?>>Dutch</option>
                                 <option value="es" <?php if (LANG=="es") echo "selected";?>>Spain</option>
-                                <option value="my" <?php if (LANG=="my") echo "selected";?>>Malay</option>
+                                <option value="rs" <?php if (LANG=="rs") echo "selected";?>>Serbian</option>
                                 <option value="ru" <?php if (LANG=="ru") echo "selected";?>>Russian</option>
-                                <option value="zh_tw" <?php if (LANG=="zh_tw") echo "selected";?>>Taiwan</option>
+                                <option value="zh_tw" <?php if (LANG=="zh_tw") echo "selected";?>>Taiwanese</option>
                             </select>
                         </td>
-					</tr>				
+					</tr>
 					<tr>
 						<td>Server Speed</td>
 						<td><input class="fm" name="speed" value="<?php echo SPEED;?>" style="width: 20%;"></td>
@@ -76,7 +76,7 @@ function refresh(tz) {
 					<tr>
 						<td>Troop Speed</td>
 						<td><input class="fm" name="incspeed" value="<?php echo INCREASE_SPEED;?>" style="width: 20%;"></td>
-					</tr>					
+					</tr>
 						<td>Evasion Speed</td>
 						<td><input class="fm" name="evasionspeed" value="<?php echo EVASION_SPEED;?>" style="width: 20%;"></td>
 					</tr>
@@ -129,7 +129,7 @@ function refresh(tz) {
 								<option value="432000" <?php if (PROTECTION=="432000") echo "selected";?>>120 hours (5 days)</option>
 							</select>
 						</td>
-					</tr>	
+					</tr>
 					<tr>
 						<td>Register Open</td>
 						<td>
@@ -148,7 +148,7 @@ function refresh(tz) {
 							</select>
 						</td>
 					</tr>
-					<tr>	
+					<tr>
 						<td>Quest</td>
 						<td>
 							<select name="quest">
@@ -214,7 +214,7 @@ function refresh(tz) {
 							</select>
 						</td>
 					</tr>
-					<tr> 
+					<tr>
 						<td>Tourn Threshold</td>
 						<td><input class="fm" name="ts_threshold" value="<?php echo TS_THRESHOLD;?>" style="width: 20%;"></td>
 					</tr>
diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 09ead08e..97f9086a 100755
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -654,11 +654,10 @@ class Automation {
 
                     if ($level != 1) {
                         $max -= ${'bid'.$indi['type']}[$level-1]['attri'] * STORAGE_MULTIPLIER;
-                        $max += ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
-                    } else {
-                        $max = ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
                     }
 
+                    $max += ${'bid'.$indi['type']}[$level]['attri'] * STORAGE_MULTIPLIER;
+
                     $fieldsToSet[$fieldDbName] = $max;
                 }
 
diff --git a/install/templates/config.tpl b/install/templates/config.tpl
index 76140317..af628c83 100644
--- a/install/templates/config.tpl
+++ b/install/templates/config.tpl
@@ -4,15 +4,15 @@
 ##                      -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                      ##
 ## ---------------------------------------------------------------------------------------- ##
 ##  Project:       TravianZ                                                                 ##
-##  Version:       22.06.2015                    			                                ## 
+##  Version:       22.06.2015                    			                                ##
 ##  Filename       config.tpl                                                               ##
-##  Developed by:  Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix, martinambrus  ## 
+##  Developed by:  Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix, martinambrus  ##
 ##  Fixed by:      Shadow - STARVATION , HERO FIXED COMPL.  		                        ##
 ##  Fixed by:      InCube - double troops				                                    ##
 ##  License:       TravianZ Project                                                         ##
 ##  Copyright:     TravianZ (c) 2010-2015. All rights reserved.                             ##
 ##  URLs:          http://travian.shadowss.ro                		                        ##
-##  Source code:   https://github.com/Shadowss/TravianZ		                                ## 
+##  Source code:   https://github.com/Shadowss/TravianZ		                                ##
 ##                                                                                          ##
 ##############################################################################################
 
@@ -141,6 +141,9 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
                 <select name="lang">
                     <option value="en" selected="selected">English</option>
                     <option value="es">Spanish</option>
+                    <option value="rs">Serbian</option>
+                    <option value="ru">Rusian</option>
+                    <option value="zh_tw">Taiwanese</option>
                 </select>
             </td>
         </tr>
@@ -279,15 +282,15 @@ echo "<div class=\"headline\"><span class=\"f10 c5\">Error creating constant.php
     </p>
     <!-- <RIGHT BOX - GPACK RELATED>
         <span><center><strong>GPACK RELATED</strong></center></span><br />
-        
-        
+
+
         <span class="f9 c6 c2">GPack:</span><span class="c3"><select name="gpack">
           <option value="false" selected="selected">No</option>
           <option value="true" disabled="disabled">Yes</option></select></span><br /><br />
         <span class="f9 c6 c2">GPack Design:</span><span class="c3"><select name="gp_locate">
           <option value="gpack/travian_default/" selected="selected">Travian Default
           <option value="gpack/travianx_v1/">TravianX v1 by Dzoki</option></select></span><br /><br />
-        
+
         -->
     <!-- </RIGHT BOX - GPACK RELATED> -->
     <p>