diff --git a/OpenSim/Framework/GridInfo.cs b/OpenSim/Framework/GridInfo.cs
index cc5ae09ec8..a3dbdda42e 100644
--- a/OpenSim/Framework/GridInfo.cs
+++ b/OpenSim/Framework/GridInfo.cs
@@ -319,18 +319,18 @@ namespace OpenSim.Framework
 
         public int CompareTo(OSHHTPHost other)
         {
-            if (((Flags & other.Flags) & OSHTTPURIFlags.ValidHost) != 0)
+            if (Port == other.Port && ((Flags & other.Flags) & OSHTTPURIFlags.ValidHost) != 0)
             {
-                return URI.CompareTo(other.Host);
+                return Host.CompareTo(other.Host);
             }
             return -1;
         }
 
         public bool Equals(OSHHTPHost other)
         {
-            if (((Flags & other.Flags) & OSHTTPURIFlags.ValidHost) != 0)
+            if (Port == other.Port && ((Flags & other.Flags) & OSHTTPURIFlags.ValidHost) != 0)
             {
-                return URI.Equals(other.URI);
+                return Host.Equals(other.Host);
             }
             return false;
         }
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index f870c65de4..4b9ecd4831 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -183,24 +183,24 @@
 
 
 [Hypergrid]
-    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+    ;# {HomeURI} {Hypergrid} {The Home URL of this grid} {}
     ;; This is the address of the external robust server that
     ;; runs the UserAgentsService, possibly this server.
     ;; For example http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
     ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this grid} {}
     ;; This is the address of the external robust server
     ;; that runs the Gatekeeper service, possibly this server.
     ;; For example http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    # {GatekeeperURIAlias} {Hypergrid} {old http schema (default http://), hostnames (FQDN), or IPs of the gatekeeper of this world and port (default 80 or 443)} {}
-    ;; comma separated list, 
-    ;; in case there was for example a dns change, etc
-    ;; or you have other grid url for local users
+    # {GatekeeperURIAlias} {Hypergrid} {alternative hostnames (FQDN), or IPs of the gatekeeper of this grid and port (default 80 or 443 if alias starts with https://)} {}
+    ;; comma separated list,
+    ;; this is to allow this grid to identify this as references to itself
+    ;; entries can be unsecure url (host:port) if using ssl, direct login url if diferent, old grid url, etc
     ; GatekeeperURIAlias = "login.osgrid.org"
 
 [AccessControl]
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 142e6d3c31..6acc2a6ea4 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -47,9 +47,10 @@
     ;; This is a default that can be overwritten in some sections.
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    ;# {GatekeeperURIAlias} {Hypergrid} {Old hostnames (FQDN), or IPs of the gatekeeper of this world and port (default 80 or 443)} {}
-    ;; comma separated list, 
-    ;; in case there was for example a dns change, etc
+    ;# {GatekeeperURIAlias} {Hypergrid} {alternative hostnames (FQDN) or IPs of the gatekeeper of this world and port (default 80 or 443 if entry starts with https://)} {}
+    ;; comma separated list,
+    ;; this is to allow this world to identify this entries also as references to itself
+    ;; entries can be unsecure url (host:port) if using ssl, direct login url if diferent, old grid url, etc
     ; GatekeeperURIAlias = myoldname.something.org, 127.0.0.1,127.0.0.1:8043
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
@@ -60,9 +61,9 @@
     ;; This is a default that can be overwritten in some sections.
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    ;# {HomeURIAlias} {Hypergrid} {Old hostnames (FQDN), or IPs of the gatekeeper of this world and port (default 80 or 443)} {}
+    ;# {HomeURIAlias} {Hypergrid} {alternative hostnames (FQDN), or IPs of the home service of this world and port (default 80 or 443)} {}
     ;; comma separated list, 
-    ;; in case there was for example a dns change, etc
+    ;; see GatekeeperURIAlias
     ; HomeURIAlias = myoldname.something.org, 127.0.0.1,127.0.0.1:8043	
 
 [Modules]