diff --git a/CHANGESTODO b/CHANGESTODO
index 5feb92c..521312f 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -466,8 +466,6 @@ ________________________________________________________________________
       occasional failure reports to all involved senders, then silently
       drops things that were undeliverable (in the case of packet ids,
       the broken recipient still has the possibility to recover the next day)
-- Repeatedly unable to reach whatever.example.com in order to deliver a
-  _message_private to 0. Why does it say "0" here.. ouch.
 ? what to do when hosts talk faster then we resolve them?
   see around _error_invalid_host_slow
 
diff --git a/world/default/de/plain.textdb b/world/default/de/plain.textdb
index 9cc4e0f..0a98b5c 100644
--- a/world/default/de/plain.textdb
+++ b/world/default/de/plain.textdb
@@ -5,13 +5,13 @@ _warning_server_shutdown_temporary
 |Serverneustart: [_reason]
 
 _status_circuit_encryption_cipher
-|Gratuliere! Deine Verbindung ist mit Folgenlosigkeit verschlüsselt.
+|Gratuliere! Deine Verbindung ist mit forward secrecy verschlüsselt ([_circuit_encryption_cipher]).
 
 _warning_circuit_encryption_cipher
-|Deine Verbindung ist leider ohne Folgenlosigkeit verschlüsselt ([_circuit_encryption_cipher]).
+|Deine Verbindung ist leider ohne forward secrecy verschlüsselt ([_circuit_encryption_cipher]).
 
 _error_circuit_encryption_cipher
-|Deine Verbindung ist ohne Folgenlosigkeit verschlüsselt ([_circuit_encryption_cipher]).
+|Deine Verbindung ist ohne forward secrecy verschlüsselt ([_circuit_encryption_cipher]).
 
 _failure_disabled_function_register
 |Registrierung ist auf diesem Server deaktiviert.
diff --git a/world/default/en/plain.textdb b/world/default/en/plain.textdb
index adb70be..8a7d1a3 100644
--- a/world/default/en/plain.textdb
+++ b/world/default/en/plain.textdb
@@ -5,10 +5,10 @@ _status_circuit_encryption_cipher
 |Congratulations. Your connection is encrypted with forward secrecy.
 
 _warning_circuit_encryption_cipher
-|Your cipher choice does not provide forward secrecy ([_circuit_encryption_cipher]).
+|Your [_circuit_encryption_cipher] cipher does not provide forward secrecy.
 
 _error_circuit_encryption_cipher
-|Unfortunately your cipher choice does not provide forward secrecy ([_circuit_encryption_cipher]).
+|Unfortunately your [_circuit_encryption_cipher] cipher does not provide forward secrecy.
 
 _failure_disabled_function_register
 |Registration disabled on this server.
diff --git a/world/default/it/plain.textdb b/world/default/it/plain.textdb
index 36e7e75..58d4ffc 100644
--- a/world/default/it/plain.textdb
+++ b/world/default/it/plain.textdb
@@ -2,13 +2,13 @@
 ## tradotto al 30% ... cerca /TODO/ per continuare
 
 _status_circuit_encryption_cipher
-|Muy bueno! La tua connessione è crittata senza conseguenze.
+|Muy bueno! La tua connessione è crittata con forward secrecy.
 
 _warning_circuit_encryption_cipher
-|La tua connessione non è crittata senza conseguenze ([_circuit_encryption_cipher]).
+|La tua connessione non provvede forward secrecy ([_circuit_encryption_cipher]).
 
 _error_circuit_encryption_cipher
-|Purtroppo la tua connessione non è crittata senza conseguenze ([_circuit_encryption_cipher]).
+|Purtroppo la tua connessione non provvede forward secrecy ([_circuit_encryption_cipher]).
 
 _failure_disabled_function_register
 |Registrazione di nuovi utenti disabilitata su questo server.
diff --git a/world/net/circuit.c b/world/net/circuit.c
index a4d1546..d2a7807 100644
--- a/world/net/circuit.c
+++ b/world/net/circuit.c
@@ -151,7 +151,7 @@ void pushback(string failmc) {
 					  // name in this case (especially if
 					  // we decide that source shouldn't
 					  // be the original target)?
-	       "Could not establish a circuit to [_host] in order to deliver a [_method_relay] to [_source].",
+	       0, // "Could not establish a circuit to [_host] in order to deliver a [_method_relay] to [_source].",
 	       ([ "_method_relay": t[1],
 		  "_data_relay" : t[2],
 		// we used to add the vars to the error message,
diff --git a/world/net/include/place.gen b/world/net/include/place.gen
index 0d7922c..0f365c5 100644
--- a/world/net/include/place.gen
+++ b/world/net/include/place.gen
@@ -502,6 +502,9 @@ enter(source, mc, data, vars) {
 	if (!((objectp(source) &&
 		// should use trustworthy level 9 instead? if so.. how?
 	       (query_ip_number(source) == "127.0.0.1"
+#  ifdef SECURE_IP_NUMBER
+	     || SECURE_IP_NUMBER(query_ip_number(source))
+#  endif
 	     || query_ip_number(source) == __HOST_IP_NUMBER__ ))
 #  if __EFUN_DEFINED__(tls_query_connection_state)
 		// psyc client.. may also one day be a psyc server, in that
diff --git a/world/net/psyc/circuit.c b/world/net/psyc/circuit.c
index e8d9cbb..60fefb8 100644
--- a/world/net/psyc/circuit.c
+++ b/world/net/psyc/circuit.c
@@ -212,7 +212,7 @@ int logon(int neverfails) {
 	if (tls_available() && tls_query_connection_state(ME) == 1) {
 	    if (t = tls_bad_cipher(ME, "psyc")) {
 		croak("_error_circuit_encryption_cipher",
-		  "Your cipher choice does not provide forward secrecy.",
+  "Your [_circuit_encryption_cipher] cipher does not provide forward secrecy.",
 		    ([ "_circuit_encryption_cipher": t ]));
 		QUIT
 	    }
diff --git a/world/net/spyc/circuit.c b/world/net/spyc/circuit.c
index 5461d05..34e1875 100644
--- a/world/net/spyc/circuit.c
+++ b/world/net/spyc/circuit.c
@@ -121,7 +121,7 @@ int logon(int failure) {
 		    P0(("certinfo: %O\n", certinfo))
 		    if (t = tls_bad_cipher(ME, "psyc")) {
 			    croak("_error_circuit_encryption_cipher",
-		      "Your cipher choice does not provide forward secrecy.",
+  "Your [_circuit_encryption_cipher] cipher does not provide forward secrecy.",
 				([ "_circuit_encryption_cipher": t ]));
 			    //destruct(ME);
 		    }