diff --git a/Admin/Templates/playerinfo.tpl b/Admin/Templates/playerinfo.tpl
index 0a453709..6d67043e 100644
--- a/Admin/Templates/playerinfo.tpl
+++ b/Admin/Templates/playerinfo.tpl
@@ -150,34 +150,33 @@
 									<?php
 										## not sure if this is correct
 										$quest = $user['quest'];
-										if($quest == 0) { $questname = "Woodcutter"; }
-										elseif($quest ==1) {$questname = "Crop"; }
-										elseif($quest ==2) {$questname = "Your Villages Name"; }
-										elseif($quest ==3) {$questname = "Other Players"; }
-										elseif($quest ==4) {$questname = "Two Building Order"; }
-										elseif($quest ==5) {$questname = "Messages"; }
-										elseif($quest ==6) {$questname = "Neighbors"; }
-										elseif($quest ==7) {$questname = "Huge Army"; }
-										elseif($quest ==8) {$questname = "One Each!"; }
-										elseif($quest ==9) {$questname = "Coming Soon!"; }
-										elseif($quest ==1) {$questname = "Reports"; }
-										elseif($quest ==11) {$questname = "Everything to 1!"; }
-										elseif($quest ==12) {$questname = "Dove of Peace"; }
-										elseif($quest ==13) {$questname = "Cranny"; }
-										elseif($quest ==14) {$questname = "To Two!"; }
-										elseif($quest ==15) {$questname = "Instruction"; }
-										elseif($quest ==16) {$questname = "Main Building"; }
-										elseif($quest ==17) {$questname = "Advanced!" ;}
-										elseif($quest ==18) {$questname = "Weapons or Dough?"; }
+										if($quest == 1) { $questname = "Woodcutter"; }
+										elseif($quest ==2) {$questname = "Crop"; }
+										elseif($quest ==3) {$questname = "Your Villages Name"; }
+										elseif($quest ==4) {$questname = "Other Players"; }
+										elseif($quest ==5) {$questname = "Two Building Order"; }
+										elseif($quest ==6) {$questname = "Messages"; }
+										elseif($quest ==7) {$questname = "Huge Army!"; }
+										elseif($quest ==8) {$questname = "Everything to 1!"; }
+										elseif($quest ==9) {$questname = "Dove of Peace"; }
+										elseif($quest ==10) {$questname = "Cranny"; }
+										elseif($quest ==11) {$questname = "To Two!"; }
+										elseif($quest ==12) {$questname = "Instruction"; }
+										elseif($quest ==13) {$questname = "Main Building"; }
+										elseif($quest ==14) {$questname = "Advanced!" ;}
+										elseif($quest ==15) {$questname = "Weapons or Dough"; }
+										elseif($quest ==16) {$questname = "Military: Rally Point"; }
+										elseif($quest ==17) {$questname = "Military: Barracks"; }
+										elseif($quest ==18) {$questname = "Military: Train 2 Troops"; }
 										elseif($quest ==19) {$questname = "Economy: Granary"; }
-										elseif($quest ==20) {$questname = "Military: Rally Point"; }
-										elseif($quest ==21) {$questname = "Economy: Warehouse"; }
-										elseif($quest ==22) {$questname = "Military: Barracks"; }
-										elseif($quest ==23) {$questname = "Economy: Marketplace"; }
-										elseif($quest ==24) {$questname = "Military: Train 2 Troops"; }
-										elseif($quest ==25) {$questname = "Everything to 2!"; }
+										elseif($quest ==20) {$questname = "Economy: Warehouse"; }
+										elseif($quest ==21) {$questname = "Economy: Marketplace"; }
+										elseif($quest ==22) {$questname = "Everything to 2!"; }
 										else { $questname = "Unknown"; }
-										$quesst = $quest +1;
+										$quesst = $quest;
+										if($quest > 18){
+										$quesst = $quest - 3;
+										}
 										$questinfo = "$quesst - $questname";
 									?>
 								<input disabled="disabled" style="width: 80%;" class="fm" name="quest" value="<?php echo $questinfo; ?>"> <a href="admin.php?p=editUser&uid=<?php echo $id; ?>"><img src="../img/admin/edit.gif" title="Edit Quest"></a></td>
diff --git a/GameEngine/Admin/Mods/editPlus.php b/GameEngine/Admin/Mods/editPlus.php
index 71293555..c9e87ccf 100644
--- a/GameEngine/Admin/Mods/editPlus.php
+++ b/GameEngine/Admin/Mods/editPlus.php
@@ -28,21 +28,42 @@ $b1dur = $_POST['wood'] * 86400;
 $b2dur = $_POST['clay'] * 86400;
 $b3dur = $_POST['iron'] * 86400;
 $b4dur = $_POST['crop'] * 86400;
-$quest = $_POST['quest'];
 
-if($pdur  > 1){ $plus = (time() + $pdur); } else { $pdur = 'plus'; }
-if($b1dur > 1){ $wood = (time() + $b1dur); } else { $wood = 'b1'; }
-if($b2dur > 1){ $clay = (time() + $b2dur); } else { $clay = 'b2'; }
-if($b3dur > 1){ $iron = (time() + $b3dur); } else { $iron = 'b3'; }
-if($b4dur > 1){ $crop = (time() + $b4dur); } else { $crop = 'b4'; }
+$sql1 = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE id = ".$id."");
+$user = mysql_fetch_array($sql1);
+
+if($user['plus'] < time()){
+if($pdur > 1){ $plus = (time() + $pdur); } else { $plus = time(); }
+}else{
+if($pdur > 1){ $plus = ($user['plus'] + $pdur); } else { $plus = $user['plus']; }
+}
+if($user['b1'] < time()){
+if($b1dur > 1){ $wood = (time() + $b1dur); } else { $wood = time(); }
+}else{
+if($b1dur  > 1){ $wood = ($user['b1'] + $b1dur); } else { $wood = $user['b1']; }
+}
+if($user['b2'] < time()){
+if($b2dur > 1){ $clay = (time() + $b2dur); } else { $clay = time(); }
+}else{
+if($b2dur > 1){ $clay = ($user['b2'] + $b2dur); } else { $clay = $user['b2']; }
+}
+if($user['b3'] < time()){
+if($b3dur > 1){ $iron = (time() + $b3dur); } else { $iron = time(); }
+}else{
+if($b3dur > 1){ $iron = ($user['b3'] + $b3dur); } else { $iron = $user['b3']; }
+}
+if($user['b4'] < time()){
+if($b4dur > 1){ $crop = (time() + $b4dur); } else { $crop = time(); }
+}else{
+if($b4dur > 1){ $crop = ($user['b4'] + $b4dur); } else { $crop = $user['b4']; }
+}
 
 mysql_query("UPDATE ".TB_PREFIX."users SET 
 	plus = '".$plus."',
 	b1 = '".$wood."', 
 	b2 = '".$clay."',
 	b3 = '".$iron."',
-	b4 = '".$crop."', 
-	quest = '".$quest."' 
+	b4 = '".$crop."' 
 	WHERE id = $id") or die(mysql_error());
 
 header("Location: ../../../Admin/admin.php?p=player&uid=".$id."");
diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl
index 8e7ace24..815ab3ff 100644
--- a/Templates/Ajax/quest_core.tpl
+++ b/Templates/Ajax/quest_core.tpl
@@ -505,7 +505,7 @@ if ($rRes!=$rSubmited){ ?>
 <?php } elseif($_SESSION['qst']== 15){
 
 // Ask from plyer ?>
-{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> Task 16: Weapons or Dough<\/h1><br \/><i>&rdquo;Now you have to make a decision: Either trade peacefully or become a dreaded warrior.\r\n<br \/><br \/>\r\nFor the marketplace you need a granary, for the barracks you need a rally point.&rdquo;<\/i><br \/><br \/><input type=\"hidden\" id=\"qst_val\" value=\"\" \/><input onclick=\"javascript: qst_next('','19');\" type=\"button\" value=\"Economy\" class=\"qb1\"\/><input onclick=\"javascript: qst_next('','16');\" type=\"button\" value=\"Military\" class=\"qb2\" \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"granary_rally\"><\/div>\n\t\t","number":"-19","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
+{"markup":"\n\t\t<div id=\"qstd\"><h1> <img class=\"point\" src=\"img\/x.gif\" alt=\"\" title=\"\"\/> Task 15: Weapons or Dough<\/h1><br \/><i>&rdquo;Now you have to make a decision: Either trade peacefully or become a dreaded warrior.\r\n<br \/><br \/>\r\nFor the marketplace you need a granary, for the barracks you need a rally point.&rdquo;<\/i><br \/><br \/><input type=\"hidden\" id=\"qst_val\" value=\"\" \/><input onclick=\"javascript: qst_next('','19');\" type=\"button\" value=\"Economy\" class=\"qb1\"\/><input onclick=\"javascript: qst_next('','16');\" type=\"button\" value=\"Military\" class=\"qb2\" \/><span id=\"qst_accpt\"><\/span><\/div>\n\t\t<div id=\"qstbg\" class=\"granary_rally\"><\/div>\n\t\t","number":"-19","reward":false,"qgsrc":"q_l<?php echo $session->userinfo['tribe'];?>","msrc":"<?php echo $messagelol; ?>","altstep":99}
 
 <?php } elseif($_SESSION['qst']== 16){