diff --git a/CHANGESTODO b/CHANGESTODO
index 0d9221f..18aadbc 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -1853,9 +1853,9 @@ see also: http://about.psyc.eu/SPAM
    evtl nicht alle im richtigen channel, um den enter zu sehen..)
 
 == IRC ISSUES 1.0 ======================================================
-- according to rfc and ircd source IRC parser should accept when the last
-  argument is just a word instead of a phrase prefixed by :
-  this is unusual, but legal:  "PRIVMSG #blah hello"
+- when using +follow instead of /join, the current place is stored and
+  an autojoin is performed on next login. we should abolish the concept
+  of "current place" for irc clients, i guess.
 
 + some irc clients do not implement their own pinging, and some NATs really
   kill your irc session if it is too quiet too long. we need optional server
@@ -3953,7 +3953,28 @@ net/spyc net/psyc
 +	looks like it is a good idea to activate XMPP_BIDI by default
 -	folklore: fixed the output order of messages in place/basic
 === 201602 ============================================================
+-	disallow people to expose private data by crypto downgrade
 +	irc: introducing _data_psyctext as a way to output the proper
 	psyced error message to IRC clients when failing to enter
 	a channel with restrictions like obligatory encryption
-
++	more advanced psyconf
+=== 201605 ============================================================
++	support for ACME aka letsencrypt
++	gentoo ebuilds have moved into youbroketheinternet overlay
+=== 201606 ============================================================
+-	according to rfc and ircd source IRC parser should accept when 
+	the last argument is just a word instead of a phrase prefixed by :
+	this is unusual, but legal:  "PRIVMSG #blah hello" (thx defanor)
+	-> fixed in a68a84b9248ac3865d98c86397df3d4451905f61
+=== 201607 ============================================================
++	integration of textual MUD gaming by /set mudlink and /talk $mud
++	demonstration of outgoing TCP from chatrooms with the @nemesis
+	place that connects to the Nemesis MUD
++	properly display onion-protected incoming connections
+	in /tcp and /lu
+-	minor fix in @remotor for users of the Tor remote control tool
+=== 2016xx ============================================================
++	improve resistance against anti-ethical business models:
+	future changes to psyced are subject to Affero GPL
++	recognize gnunet-exit as secure transport
+=== 2017xx ============================================================
diff --git a/bin/psyconf b/bin/psyconf
index aeb611c..2448548 100755
--- a/bin/psyconf
+++ b/bin/psyconf
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 ### -I/opt/psyced/utility
 # the include path would help finding INI.pm, but what if you the user
 # have decided to install psyced elsewhere?
diff --git a/place/freenode.c b/place/freenode.c
index 7f32f95..5f6b946 100644
--- a/place/freenode.c
+++ b/place/freenode.c
@@ -12,8 +12,8 @@
 
 #ifdef BRAIN
 # echo BRAIN: connecting to freenode IRC server
-//# define CONNECT_IRC	"irc." NAME ".net"
-# define CONNECT_IRC	"calvino.freenode.net"
+# define CONNECT_IRC	"irc." NAME ".net"
+//# define CONNECT_IRC	"calvino.freenode.net"
 //# define CHAT_CHANNEL	"esp"
 //# define CHAT_CHANNEL	"23c3"
 # define PASS_IRC	IRCGATE_FREENODE
diff --git a/world/net/gateway/generic.c b/world/net/gateway/generic.c
index 9a5f507..c2da1cd 100644
--- a/world/net/gateway/generic.c
+++ b/world/net/gateway/generic.c
@@ -136,7 +136,7 @@ static who() {
         mixed idle;
         string desc;
 
-	reply("--- /who of local users of "+ SERVER_UNIFORM);
+	reply("--- /who of visible local users of "+ SERVER_UNIFORM);
 	u = objects_people();
 	all = sizeof(u) < 23;
 	// same code in usercmd.i
diff --git a/world/net/jabber/common.c b/world/net/jabber/common.c
index 830dcb9..4459dc4 100644
--- a/world/net/jabber/common.c
+++ b/world/net/jabber/common.c
@@ -51,7 +51,7 @@ int emit(string message) {
 	string t, err;
 	// according to http://www.w3.org/TR/xml/#charsets
 	// remove illegal unicode chars --// thx elmex
-	err = catch(t = regreplace(message, "[^\\x{9}\\x{A}\\x{D}\\x{20}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{10000}-\\x{10FFFFF}]+", "*", RE_GLOBAL | RE_UTF8); nolog);
+	err = catch(t = regreplace(message, "[^\\x{9}\\x{A}\\x{D}\\x{20}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{10000}-\\x{FFFFF}]+", "*", RE_GLOBAL | RE_UTF8); nolog);
 	if (err || t != message) {
 		// Info: Chars filtered to %O. Message was %O.
 		log_file("CHARS_XMPP", "[%s] %O %O %O\n", ctime(),
diff --git a/world/net/tn/outgoing.c b/world/net/tn/outgoing.c
index d290dd4..b269237 100644
--- a/world/net/tn/outgoing.c
+++ b/world/net/tn/outgoing.c
@@ -65,7 +65,7 @@ logon(failure) {
 	int rc = ::logon(failure);
 	unless (rc) return 0;
 	next_input_to(#'parse);
-	parse("[connected]");	// hack to maintain logon ascii graphics intact
+	parse("<connected>");	// hack to maintain logon ascii graphics intact
 				// could have queued this instead:
 	if (connectstring) call_out(#'send, 1, connectstring);
 	call_out(#'runQ, 3);	// deliver the queue of messages in circuit.c