diff --git a/include/admin/About.php b/include/admin/About.php
index 91c410b..3eade66 100644
--- a/include/admin/About.php
+++ b/include/admin/About.php
@@ -16,7 +16,7 @@ class About{
 
 
 		echo '<p>You\'re currently using version '.\gpversion.' of our free, open source and easy to use content management system.';
-		echo ' Our code is <a href="https://github.com/Typesetter/Typesetter">hosted on GitHub</a> ';
+		echo ' Our code is <a href="https://github.com/gtbu/Typesetter-5.3-p8">hosted on GitHub</a> ';
 		echo 'and licensed under version 2 of the <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License</a>. ';
 		echo '</p>';
 
@@ -42,7 +42,7 @@ class About{
 		echo '<p>This one is a bit more subjective, but just as important. ';
 		echo ' There are multiple ways to give us feedback. The following services allow you to rate and comment on '.\CMS_NAME.'. ';
 		echo '</p>';
-		echo '<p><a href="https://github.com/Typesetter/Typesetter" target="_blank">Fork on GitHub</a></p>';
+		echo '<p><a href="https://github.com/gtbu/Typesetter-5.3-p8" target="_blank">Fork on GitHub</a></p>';
 		echo '<p><a href="https://www.opensourcecms.com/typesetter-cms/" target="_blank">OpensourceCMS.com</a></p>';
 
 
@@ -52,9 +52,10 @@ class About{
 		$projects['ColorBox']		= 'www.jacklmoore.com/colorbox';
 		$projects['Bootstrap']		= 'getbootstrap.com';
 		$projects['Bootswatch']		= 'bootswatch.com';
-		$projects['jQuery']			= 'jquery.com';
+		$projects['jQuery']		= 'jquery.com';
 		$projects['jQuery UI']		= 'jqueryui.com';
-		$projects['ScssPhp']		= 'github.com/leafo/scssphp';
+		$projects['ScssPhp']		= 'https://github.com/scssphp/scssphp';
+                $projects['Less']		= 'https://github.com/wikimedia/less.php';
 		$projects['PHPMailer']		= 'github.com/PHPMailer/PHPMailer';
 
 
diff --git a/include/admin/Tools.php b/include/admin/Tools.php
index ce4a348..d5e5d99 100644
--- a/include/admin/Tools.php
+++ b/include/admin/Tools.php
@@ -794,7 +794,7 @@ namespace gp\admin{
 				echo '<li><a href="' . CMS_DOMAIN . '/Forum">Support Forum</a></li>';
 				echo '<li><a href="' . CMS_DOMAIN . '/Services">Service Providers</a></li>';
 				echo '<li><a href="' . CMS_DOMAIN . '">Official ' . CMS_NAME . ' Site</a></li>';
-				echo '<li><a href="https://github.com/Typesetter/Typesetter/issues">Report A Bug</a></li>';
+				echo '<li><a href="https://github.com/gtbu/Typesetter-5.3-p8/issues">Report A Bug</a></li>';
 
 				$links = ob_get_clean();
 				self::_AdminPanelLinks($in_panel, $links, 'resources', 'fa fa-globe', 'res');
diff --git a/include/tool.php b/include/tool.php
index e6cc769..a7115e1 100644
--- a/include/tool.php
+++ b/include/tool.php
@@ -808,7 +808,7 @@ namespace gp{
 		public static function ServerName($strip_www=false, $with_port=false){
 
 			$add_port = '';
-			if( isset($_SERVER['SERVER_NAME']) ){
+			if( !empty($_SERVER['HTTP_HOST']) ){
 				$server = self::UrlChars($_SERVER['SERVER_NAME']);
 				if( $with_port && isset($_SERVER['SERVER_PORT']) ){
 					$port = $_SERVER['SERVER_PORT'];
diff --git a/include/tool/email.php b/include/tool/email.php
index 358000a..9a90582 100644
--- a/include/tool/email.php
+++ b/include/tool/email.php
@@ -82,7 +82,7 @@ class gp_email{
 		}
 
 		$server = \gp\tool::ServerName(true);
-		if( !$server === false ){
+		if (!boolval($server)){
 			$server = 'localhost';
 		}