diff --git a/README.md b/README.md
index 3a802f5de..9e73f0b2c 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ CZMQ's contributors are listed in the AUTHORS file. It is held by the ZeroMQ org
 <A name="toc3-73" title="Contributing" />
 ### Contributing
 
-CZMQ uses the [C4 (Collective Code Construction Contract)](http://rfc.zeromq.org/spec:16) process for contributions.
+CZMQ uses the [C4.1 (Collective Code Construction Contract)](http://rfc.zeromq.org/spec:22) process for contributions.
 
 CZMQ uses the [CLASS (C Language Style for Scalabilty)](http://rfc.zeromq.org/spec:21) guide for code style.
 
diff --git a/README.txt b/README.txt
index 14582da42..90d3a44e4 100644
--- a/README.txt
+++ b/README.txt
@@ -67,7 +67,7 @@ CZMQ's contributors are listed in the AUTHORS file. It is held by the ZeroMQ org
 
 ### Contributing
 
-CZMQ uses the [C4 (Collective Code Construction Contract)](http://rfc.zeromq.org/spec:16) process for contributions.
+CZMQ uses the [C4.1 (Collective Code Construction Contract)](http://rfc.zeromq.org/spec:22) process for contributions.
 
 CZMQ uses the [CLASS (C Language Style for Scalabilty)](http://rfc.zeromq.org/spec:21) guide for code style.
 
diff --git a/include/zbeacon.h b/include/zbeacon.h
index 27faaafbf..cf7741bb8 100644
--- a/include/zbeacon.h
+++ b/include/zbeacon.h
@@ -35,7 +35,7 @@ extern "C" {
 typedef struct _zbeacon_t zbeacon_t;
 
 //  @interface
-//  Create a new beacon
+//  Create a new beacon on a certain UDP port
 CZMQ_EXPORT zbeacon_t *
     zbeacon_new (int port_nbr);
     
@@ -43,6 +43,10 @@ CZMQ_EXPORT zbeacon_t *
 CZMQ_EXPORT void
     zbeacon_destroy (zbeacon_t **self_p);
 
+//  Return our own IP address as printable string
+CZMQ_EXPORT char *
+    zbeacon_hostname (zbeacon_t *self);
+
 //  Set broadcast interval in milliseconds (default is 1000 msec)
 CZMQ_EXPORT void
     zbeacon_set_interval (zbeacon_t *self, int interval);
@@ -67,14 +71,10 @@ CZMQ_EXPORT void
 CZMQ_EXPORT void
     zbeacon_unsubscribe (zbeacon_t *self);
 
-//  Get beacon pipe, for polling or receiving messages off
+//  Get beacon pipe, for polling or receiving messages
 CZMQ_EXPORT void *
     zbeacon_pipe (zbeacon_t *self);
-    
-//  Return our own IP address as printable string
-CZMQ_EXPORT char *
-    zbeacon_hostname (zbeacon_t *self);
-    
+
 //  Self test of this class
 void
     zbeacon_test (bool verbose);
diff --git a/src/zlist.c b/src/zlist.c
index bf3eb8eeb..19b26f336 100644
--- a/src/zlist.c
+++ b/src/zlist.c
@@ -356,7 +356,7 @@ s_compare (void *item1, void *item2)
 
 
 //  --------------------------------------------------------------------------
-//  Set list for automatic item destruction
+//  Set list for automatic item destruction; item values MUST be strings.
 
 void
 zlist_autofree (zlist_t *self)