--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@
 e107 has to be used
 - added recent menu to e107 menus
 
+- if you use it (you can), it will be overriden with e107 github sync, so just have backup
+
 ### contact.php
 
 removed

--- a/blocks/search/search.php
+++ b/blocks/search/search.php
@@ -1,8 +1,9 @@
 <?php
-if(!defined("_CHARSET")) exit( );
-	$content = "<form method=\"POST\" id=\"searchblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."search.php?action=advanced\">
-			<INPUT type=\"text\" class=\"textbox\" name=\"searchterm\" id=\"searchterm\" size=\"15\"> 
-			<INPUT type=\"hidden\" name=\"searchtype\" value=\"advanced\">
-			<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SEARCH."\"></form>";
+if (!defined('_CHARSET')) {
+    exit();
+}
+    $content = '<form method="POST" id="searchblock" enctype="multipart/form-data" action="'._BASEDIR.'searching.php?action=advanced">
+			<INPUT type="text" class="textbox" name="searchterm" id="searchterm" size="15"> 
+			<INPUT type="hidden" name="searchtype" value="advanced">
+			<INPUT type="submit" class="button" name="submit" value="'._SEARCH.'"></form>';
 
-?>

--- a/includes/emailer.php
+++ b/includes/emailer.php
@@ -50,7 +50,7 @@
 	$subject = descript(strip_tags($subject));
 	$message = descript($message);
 	// End paranoia
-
+ 
 	// Try to determine the right $type setting
  	if(strpos($message, "<br>") || strpos($message, "</p>") || strpos($message, "<br />") || strpos($message, "<br>") || strpos($message, "<a href")) $type = "html";
 	
@@ -100,7 +100,7 @@
 		$mail->ErrorInfo;
 		$mail->ClearAllRecipients();
 		$mail->ClearReplyTos();
-		return false;
+		return $mail->ErrorInfo;
 	} else {
 		$mail->ClearAllRecipients(); 
 		$mail->ClearReplyTos();