- simplify request containers

- statistics bugs
- fix missing annotation in consensus api
- work on voting

93 files changed, 703 insertions, 646 deletions

diff --git a/src/main/java/org/gnunet/arm/Arm.java b/src/main/java/org/gnunet/arm/Arm.java
index 503413f..aee353b 100644
--- a/src/main/java/org/gnunet/arm/Arm.java
+++ b/src/main/java/org/gnunet/arm/Arm.java
@@ -53,7 +53,7 @@ public class Arm {
      * further connection attempts.
      *
      * @param serviceName name of the service
-     * @param resultHandler called with the result of the request
+     * @param resultHandler called with the result of the getRequestIdentifier
      */
     public void requestServiceStop(String serviceName, ResultHandler resultHandler) {
 
diff --git a/src/main/java/org/gnunet/consensus/Consensus.java b/src/main/java/org/gnunet/consensus/Consensus.java
index 9e58fac..ee3ec2a 100644
--- a/src/main/java/org/gnunet/consensus/Consensus.java
+++ b/src/main/java/org/gnunet/consensus/Consensus.java
@@ -89,7 +89,11 @@ public class Consensus {
                      AbsoluteTime startTime, AbsoluteTime deadline) {
         client = new Client("consensus", cfg);
         client.installReceiver(new ConsensusMessageReceiver());
+        String peersString = "";
+        for (PeerIdentity pi : peers)
+            peersString += pi + ", ";
 
+        logger.info("starting consensus with {} peers given to consensus ({})", peers.length, peersString);
         JoinMessage m = new JoinMessage();
         m.numPeers = peers.length;
         m.peers = peers;
diff --git a/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java b/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java
index 9064e4b..62a2d9f 100644
--- a/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/ConcludeDoneMessage.java
@@ -21,7 +21,6 @@
 package org.gnunet.consensus.messages;
 
 
-import org.gnunet.construct.MessageUnion;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 
diff --git a/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java b/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java
index fb1c396..882d590 100644
--- a/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/ConcludeMessage.java
@@ -20,8 +20,8 @@
 
 package org.gnunet.consensus.messages;
 
-import org.gnunet.construct.*;
-import org.gnunet.util.*;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
 
 /**
  * Notify the client of a new element.
diff --git a/src/main/java/org/gnunet/consensus/messages/JoinMessage.java b/src/main/java/org/gnunet/consensus/messages/JoinMessage.java
index 2529e0e..ab1a56b 100644
--- a/src/main/java/org/gnunet/consensus/messages/JoinMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/JoinMessage.java
@@ -37,6 +37,7 @@ public class JoinMessage implements GnunetMessage.Body {
     public HashCode sessionId;
     @NestedMessage
     public AbsoluteTimeMessage startTime;
+    @NestedMessage
     public AbsoluteTimeMessage deadline;
     @VariableSizeArray(lengthField = "numPeers")
     public PeerIdentity[] peers;
diff --git a/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java b/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java
index 815c70a..4fc2413 100644
--- a/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java
+++ b/src/main/java/org/gnunet/consensus/messages/NewElementMessage.java
@@ -20,7 +20,10 @@
 
 package org.gnunet.consensus.messages;
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.FillWith;
+import org.gnunet.construct.UInt16;
+import org.gnunet.construct.UInt8;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 
 /**
diff --git a/src/main/java/org/gnunet/construct/FrameSize.java b/src/main/java/org/gnunet/construct/FrameSize.java
index 0533d0b..252f182 100644
--- a/src/main/java/org/gnunet/construct/FrameSize.java
+++ b/src/main/java/org/gnunet/construct/FrameSize.java
@@ -20,7 +20,10 @@
 
 package org.gnunet.construct;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Marker for the field storing the size of the enclosing frame in bytes.
diff --git a/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java b/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java
index 88ed11d..9f2e4a9 100644
--- a/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java
+++ b/src/main/java/org/gnunet/construct/MessageIdAnnotationProcessor.java
@@ -35,10 +35,11 @@ import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import java.io.IOException;
 import java.io.Writer;
-import java.lang.Integer;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 
 
 /**
diff --git a/src/main/java/org/gnunet/construct/ProtocolViolationException.java b/src/main/java/org/gnunet/construct/ProtocolViolationException.java
index 9de46d4..73e091a 100644
--- a/src/main/java/org/gnunet/construct/ProtocolViolationException.java
+++ b/src/main/java/org/gnunet/construct/ProtocolViolationException.java
@@ -21,8 +21,6 @@
 package org.gnunet.construct;
 
 
-import java.util.LinkedList;
-
 /**
  * Thrown when a received message is invalid.
  * 
diff --git a/src/main/java/org/gnunet/construct/ReflectUtil.java b/src/main/java/org/gnunet/construct/ReflectUtil.java
index b05a829..67bb6c2 100644
--- a/src/main/java/org/gnunet/construct/ReflectUtil.java
+++ b/src/main/java/org/gnunet/construct/ReflectUtil.java
@@ -21,7 +21,6 @@
 package org.gnunet.construct;
 
 
-import java.lang.Integer;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/gnunet/construct/parsers/FillParser.java b/src/main/java/org/gnunet/construct/parsers/FillParser.java
index 19ce252..9f63a07 100644
--- a/src/main/java/org/gnunet/construct/parsers/FillParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/FillParser.java
@@ -22,6 +22,7 @@ package org.gnunet.construct.parsers;
 
 import org.gnunet.construct.Message;
 import org.gnunet.construct.ReflectUtil;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/gnunet/construct/parsers/UnionParser.java b/src/main/java/org/gnunet/construct/parsers/UnionParser.java
index e9fcc92..2424800 100644
--- a/src/main/java/org/gnunet/construct/parsers/UnionParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/UnionParser.java
@@ -21,7 +21,6 @@
 package org.gnunet.construct.parsers;
 
 import org.gnunet.construct.*;
-import org.gnunet.construct.ProtocolViolationException;
 
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java b/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java
index fd55925..cf00c83 100644
--- a/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/VariableSizeArrayParser.java
@@ -21,7 +21,6 @@
 package org.gnunet.construct.parsers;
 
 import org.gnunet.construct.Message;
-import org.gnunet.construct.ProtocolViolationException;
 import org.gnunet.construct.ReflectUtil;
 
 import java.lang.reflect.Array;
diff --git a/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java b/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java
index 39dd7a4..9686066 100644
--- a/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java
+++ b/src/main/java/org/gnunet/construct/parsers/VariableSizeStringParser.java
@@ -44,7 +44,6 @@ import org.gnunet.construct.Message;
 import org.gnunet.construct.ReflectUtil;
 import org.gnunet.construct.StringTerminationType;
 
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 import java.util.List;
diff --git a/src/main/java/org/gnunet/core/Core.java b/src/main/java/org/gnunet/core/Core.java
index f209269..307b9a2 100644
--- a/src/main/java/org/gnunet/core/Core.java
+++ b/src/main/java/org/gnunet/core/Core.java
@@ -25,7 +25,8 @@ import org.gnunet.construct.Construct;
 import org.gnunet.construct.MessageLoader;
 import org.gnunet.mq.Envelope;
 import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
+import org.gnunet.requests.RequestIdentifier;
 import org.gnunet.util.*;
 import org.grothoff.Runabout;
 import org.slf4j.Logger;
@@ -99,7 +100,7 @@ public class Core {
 
     /**
      * Peers that we were notified about being connected to them.
-     * Every connected peer is mapped to a generator for unique request IDs.
+     * Every connected peer is mapped to a generator for unique getRequestIdentifier IDs.
      */
     private HashMap<PeerIdentity, Integer> connectedPeers = Maps.newHashMap();
 
@@ -108,7 +109,7 @@ public class Core {
      */
     private MatchingRequestContainer<RequestIdentification, NotifyTransmitReadyRequest> ntrRequests;
 
-    public static class NotifyTransmitReadyRequest extends RequestContainer.Request {
+    public static class NotifyTransmitReadyRequest extends Request {
         private final int size;
         final public PeerIdentity target;
         final public long priority;
@@ -136,7 +137,7 @@ public class Core {
             return new Envelope(m);
         }
 
-        public void cancel() {
+        public void onCancel() {
             // do nothing
         }
     }
@@ -200,7 +201,8 @@ public class Core {
         public void visit(SendMessageReady m) {
             logger.debug("got SendMessageReady");
             RequestIdentification rid = new RequestIdentification(m.smrId, m.peer);
-            NotifyTransmitReadyRequest req = ntrRequests.getRequest(rid);
+            RequestIdentifier<NotifyTransmitReadyRequest> reqId = ntrRequests.getRequestIdentifier(rid);
+            NotifyTransmitReadyRequest req = reqId.getRequest();
 
             final SendMessage sm = new SendMessage();
             sm.cork = 0;
@@ -279,7 +281,7 @@ public class Core {
      * @param target      the identity of the receiver
      * @param size        the size of the message we want to transmit
      * @param transmitter called once the core service is ready to send message
-     * @return a handle to cancel the notification
+     * @return a handle to onCancel the notification
      */
     public Cancelable notifyTransmitReady(int priority, RelativeTime maxdelay,
                                           PeerIdentity target, int size, final MessageTransmitter transmitter) {
diff --git a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java b/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
index 2bdd428..b00bd49 100644
--- a/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
+++ b/src/main/java/org/gnunet/core/NotifyInboundTrafficMessage.java
@@ -20,8 +20,10 @@
 
 package org.gnunet.core;
 
-import org.gnunet.construct.*;
-import org.gnunet.util.ATSInformation;
+import org.gnunet.construct.FillWith;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt8;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 import org.gnunet.util.PeerIdentity;
 
diff --git a/src/main/java/org/gnunet/core/RequestIdentification.java b/src/main/java/org/gnunet/core/RequestIdentification.java
index 4f6a734..2823153 100644
--- a/src/main/java/org/gnunet/core/RequestIdentification.java
+++ b/src/main/java/org/gnunet/core/RequestIdentification.java
@@ -1,6 +1,5 @@
 package org.gnunet.core;
 
-import org.gnunet.peerinfo.PeerInfo;
 import org.gnunet.util.PeerIdentity;
 
 
diff --git a/src/main/java/org/gnunet/core/SendMessage.java b/src/main/java/org/gnunet/core/SendMessage.java
index a0083ec..c3306ae 100644
--- a/src/main/java/org/gnunet/core/SendMessage.java
+++ b/src/main/java/org/gnunet/core/SendMessage.java
@@ -22,7 +22,6 @@ package org.gnunet.core;
 
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UInt64;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.AbsoluteTimeMessage;
 import org.gnunet.util.GnunetMessage;
diff --git a/src/main/java/org/gnunet/core/SendMessageReady.java b/src/main/java/org/gnunet/core/SendMessageReady.java
index aa5bf44..ba28da8 100644
--- a/src/main/java/org/gnunet/core/SendMessageReady.java
+++ b/src/main/java/org/gnunet/core/SendMessageReady.java
@@ -36,14 +36,14 @@ public class SendMessageReady implements GnunetMessage.Body {
     /**
      * How many bytes are allowed for transmission?
      * Guaranteed to be at least as big as the requested size,
-     * or ZERO if the request is rejected (will timeout,
+     * or ZERO if the getRequestIdentifier is rejected (will timeout,
      * peer disconnected, queue full, etc.).
      */
     @UInt16
     public int size;
 
     /**
-     * smrId from the request.
+     * smrId from the getRequestIdentifier.
      */
     @UInt16
     public int smrId;
diff --git a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java b/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
index 45bbe60..abf6051 100644
--- a/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
+++ b/src/main/java/org/gnunet/dht/ClientPutConfirmationMessage.java
@@ -31,7 +31,7 @@ public class ClientPutConfirmationMessage implements GnunetMessage.Body {
     @UInt32
     public int reserved;
     /**
-     * UID used to identify request with the response
+     * UID used to identify getRequestIdentifier with the response
      */
     @UInt64
     public long uid;
diff --git a/src/main/java/org/gnunet/dht/ClientPutMessage.java b/src/main/java/org/gnunet/dht/ClientPutMessage.java
index 4b63e92..1d01be4 100644
--- a/src/main/java/org/gnunet/dht/ClientPutMessage.java
+++ b/src/main/java/org/gnunet/dht/ClientPutMessage.java
@@ -41,7 +41,7 @@ public class ClientPutMessage implements GnunetMessage.Body {
     @UInt32
     public int desiredReplicationLevel;
     /**
-     * UID used to identify request with the response
+     * UID used to identify getRequestIdentifier with the response
      */
     @UInt64
     public long uid;
diff --git a/src/main/java/org/gnunet/dht/DistributedHashTable.java b/src/main/java/org/gnunet/dht/DistributedHashTable.java
index 10ac00e..0246992 100644
--- a/src/main/java/org/gnunet/dht/DistributedHashTable.java
+++ b/src/main/java/org/gnunet/dht/DistributedHashTable.java
@@ -23,7 +23,8 @@ package org.gnunet.dht;
 import com.google.common.base.Charsets;
 import org.gnunet.mq.Envelope;
 import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
+import org.gnunet.requests.RequestIdentifier;
 import org.gnunet.requests.SequentialRequestContainer;
 import org.gnunet.util.*;
 import org.gnunet.util.getopt.Argument;
@@ -31,7 +32,9 @@ import org.gnunet.util.getopt.ArgumentAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * API for the gnunet dht service.
@@ -54,7 +57,7 @@ public class DistributedHashTable {
     private MatchingRequestContainer<Long, GetRequest> getRequests;
     private SequentialRequestContainer<MonitorRequest> monitorRequests;
 
-    private class PutRequest extends RequestContainer.Request {
+    private class PutRequest extends Request {
         public byte[] data;
         public HashCode key;
         public int replicationLevel;
@@ -79,12 +82,12 @@ public class DistributedHashTable {
             return new Envelope(cpm);
         }
 
-        public void cancel() {
+        public void onCancel() {
         }
     }
 
 
-    private class GetRequest extends RequestContainer.Request {
+    private class GetRequest extends Request {
         public long uid;
         public HashCode key;
         public ResultCallback cb;
@@ -106,12 +109,12 @@ public class DistributedHashTable {
             gm.uniqueId = uid;
             return new Envelope(gm);
         }
-        public void cancel() {
+        public void onCancel() {
 
         }
     }
 
-    private class MonitorRequest extends RequestContainer.Request {
+    private class MonitorRequest extends Request {
         public int blockType;
         public HashCode key;
         public MonitorGetHandler getHandler;
@@ -140,7 +143,7 @@ public class DistributedHashTable {
             return new Envelope(mss);
         }
 
-        public void cancel() {
+        public void onCancel() {
             // todo: use priority requests
             MonitorRequest cancelRequest = new MonitorRequest();
             cancelRequest.getHandler = null;
@@ -154,9 +157,9 @@ public class DistributedHashTable {
 
     private class DHTMessageReceiver extends RunaboutMessageReceiver {
         public void visit(ClientPutConfirmationMessage pcm) {
-            PutRequest thePutRequest = putRequests.getRequest(pcm.uid);
+            PutRequest thePutRequest = putRequests.getAndRetireRequest(pcm.uid);
             if (thePutRequest == null) {
-                logger.warn("request UID not found");
+                logger.warn("getRequestIdentifier UID not found");
                 return;
             }
             if (thePutRequest.cont != null) {
@@ -165,9 +168,9 @@ public class DistributedHashTable {
         }
 
         public void visit(ClientResultMessage rm) {
-            GetRequest theGetRequest = getRequests.getRequest(rm.uid);
+            GetRequest theGetRequest = getRequests.getAndRetireRequest(rm.uid);
             if (theGetRequest == null) {
-                logger.warn("request UID not found");
+                logger.warn("getRequestIdentifier UID not found");
                 return;
             }
             theGetRequest.cb.handleResult(AbsoluteTime.fromNetwork(rm.expiration), rm.key, null, null,
@@ -176,14 +179,14 @@ public class DistributedHashTable {
         }
 
         public void visit(MonitorGetMessage monitorGetMessage) {
-            for (MonitorRequest monitorRequest : monitorRequests.iter()) {
+            for (RequestIdentifier<MonitorRequest> monitorRequest : monitorRequests.iter()) {
                 boolean typeOk = (monitorGetMessage.type == BlockType.ANY.val)
-                        || (monitorGetMessage.type == monitorRequest.blockType);
+                        || (monitorGetMessage.type == monitorRequest.getRequest().blockType);
                 boolean keyOk = monitorGetMessage.key.isAllZero()
-                        || monitorGetMessage.key.equals(monitorRequest.key);
+                        || monitorGetMessage.key.equals(monitorRequest.getRequest().key);
 
-                if (keyOk && typeOk && monitorRequest.getHandler != null) {
-                    monitorRequest.getHandler.onGet(monitorGetMessage.options, monitorGetMessage.type,
+                if (keyOk && typeOk && monitorRequest.getRequest().getHandler != null) {
+                    monitorRequest.getRequest().getHandler.onGet(monitorGetMessage.options, monitorGetMessage.type,
                             monitorGetMessage.hopCount, monitorGetMessage.desiredReplicationLevel, monitorGetMessage.getPath,
                             monitorGetMessage.key);
                 }
@@ -191,14 +194,14 @@ public class DistributedHashTable {
         }
 
         public void visit(MonitorGetRespMessage monitorGetRespMessage) {
-            for (MonitorRequest monitorRequest : monitorRequests.iter()) {
+            for (RequestIdentifier<MonitorRequest> monitorRequest : monitorRequests.iter()) {
                 boolean typeOk = (monitorGetRespMessage.type == BlockType.ANY.val)
-                        || (monitorGetRespMessage.type == monitorRequest.blockType);
+                        || (monitorGetRespMessage.type == monitorRequest.getRequest().blockType);
                 boolean keyOk = monitorGetRespMessage.key.isAllZero()
-                        || monitorGetRespMessage.key.equals(monitorRequest.key);
+                        || monitorGetRespMessage.key.equals(monitorRequest.getRequest().key);
 
-                if (keyOk && typeOk && monitorRequest.getResponseHandler != null) {
-                    monitorRequest.getResponseHandler.onGetResponse(
+                if (keyOk && typeOk && monitorRequest.getRequest().getResponseHandler != null) {
+                    monitorRequest.getRequest().getResponseHandler.onGetResponse(
                             monitorGetRespMessage.type,
                             monitorGetRespMessage.getPath,
                             monitorGetRespMessage.putPath,
@@ -211,14 +214,14 @@ public class DistributedHashTable {
         }
 
         public void visit(MonitorPutMessage monitorPutMessage) {
-            for (MonitorRequest monitorRequest : monitorRequests.iter()) {
+            for (RequestIdentifier<MonitorRequest> monitorRequest : monitorRequests.iter()) {
                 boolean typeOk = (monitorPutMessage.type == BlockType.ANY.val)
-                        || (monitorPutMessage.type == monitorRequest.blockType);
+                        || (monitorPutMessage.type == monitorRequest.getRequest().blockType);
                 boolean keyOk = monitorPutMessage.key.isAllZero()
-                        || monitorPutMessage.key.equals(monitorRequest.key);
+                        || monitorPutMessage.key.equals(monitorRequest.getRequest().key);
 
-                if (keyOk && typeOk && monitorRequest.putHandler != null) {
-                    monitorRequest.putHandler.onPut(monitorPutMessage.options, monitorPutMessage.type,
+                if (keyOk && typeOk && monitorRequest.getRequest().putHandler != null) {
+                    monitorRequest.getRequest().putHandler.onPut(monitorPutMessage.options, monitorPutMessage.type,
                             monitorPutMessage.hopCount, monitorPutMessage.expirationTime,
                             monitorPutMessage.putPath, monitorPutMessage.key, monitorPutMessage.data);
                 }
@@ -274,14 +277,14 @@ public class DistributedHashTable {
     /**
      * Request results from the DHT.
      *
-     * @param timeout      timeout for the request
+     * @param timeout      timeout for the getRequestIdentifier
      * @param type         which type of data do we want to query for? (the DHT does not support TYPE_ANY)
      * @param key          the key we want to query
      * @param replication  how many peers do we want to ask?
      * @param routeOptions extra routing options, null for default
      * @param xquery       extra query parameters, defaults to null
      * @param cb           the callback object for results or failure indication
-     * @return a handle to cancel the request
+     * @return a handle to onCancel the getRequestIdentifier
      */
     public Cancelable startGet(RelativeTime timeout, int type, HashCode key,
                                int replication, EnumSet<RouteOption> routeOptions,
@@ -320,7 +323,7 @@ public class DistributedHashTable {
     }
 
     public static void main(String[] args) {
-        new Program(args) {
+        new Program() {
             @Argument(action = ArgumentAction.SET,
                     shortname = "p",
                     longname = "put",
@@ -390,7 +393,7 @@ public class DistributedHashTable {
                         @Override
                         public void cont(boolean success) {
                             if (success) {
-                                System.out.println("put request sent");
+                                System.out.println("put getRequestIdentifier sent");
                             } else {
                                 System.out.println("error");
                             }
@@ -444,6 +447,6 @@ public class DistributedHashTable {
                     });
                 }
             }
-        }.start();
+        }.start(args);
     }
 }
diff --git a/src/main/java/org/gnunet/dht/MonitorGetMessage.java b/src/main/java/org/gnunet/dht/MonitorGetMessage.java
index a3e6297..ba9bf44 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetMessage.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetMessage.java
@@ -40,7 +40,7 @@ public class MonitorGetMessage implements GnunetMessage.Body {
     public int options;
 
     /**
-     * The type of data in the request.
+     * The type of data in the getRequestIdentifier.
      */
     @UInt32
     public int type;
diff --git a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java b/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
index 6a25440..c298328 100644
--- a/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
+++ b/src/main/java/org/gnunet/dht/MonitorGetRespMessage.java
@@ -56,7 +56,7 @@ public class MonitorGetRespMessage implements GnunetMessage.Body {
     public AbsoluteTimeMessage expiration;
 
     /**
-     * The key of the corresponding GET request.
+     * The key of the corresponding GET getRequestIdentifier.
      */
     @NestedMessage
     public HashCode key;
diff --git a/src/main/java/org/gnunet/dht/MonitorPutMessage.java b/src/main/java/org/gnunet/dht/MonitorPutMessage.java
index cf6b1fd..7e242c7 100644
--- a/src/main/java/org/gnunet/dht/MonitorPutMessage.java
+++ b/src/main/java/org/gnunet/dht/MonitorPutMessage.java
@@ -38,7 +38,7 @@ public class MonitorPutMessage implements GnunetMessage.Body {
     public int options;
 
     /**
-     * The type of data in the request.
+     * The type of data in the getRequestIdentifier.
      */
     @UInt32
     public int type;
diff --git a/src/main/java/org/gnunet/dht/MonitorStartStop.java b/src/main/java/org/gnunet/dht/MonitorStartStop.java
index b79ec3e..ffe5c9a 100644
--- a/src/main/java/org/gnunet/dht/MonitorStartStop.java
+++ b/src/main/java/org/gnunet/dht/MonitorStartStop.java
@@ -28,7 +28,7 @@ import org.gnunet.util.GnunetMessage;
 import org.gnunet.util.HashCode;
 
 /**
- * Message to request monitoring messages, clients --> DHT service.
+ * Message to getRequestIdentifier monitoring messages, clients --> DHT service.
  */
 @UnionCase(153)
 public class MonitorStartStop implements GnunetMessage.Body {
diff --git a/src/main/java/org/gnunet/dht/RouteOption.java b/src/main/java/org/gnunet/dht/RouteOption.java
index b74b528..e6593b4 100644
--- a/src/main/java/org/gnunet/dht/RouteOption.java
+++ b/src/main/java/org/gnunet/dht/RouteOption.java
@@ -39,7 +39,7 @@ enum RouteOption {
      */
     RECORD_ROUTE(2),
     /**
-     * This is a 'FIND-PEER' request, so approximate results are fine.
+     * This is a 'FIND-PEER' getRequestIdentifier, so approximate results are fine.
      */
     FIND_PEER(4),
     /**
diff --git a/src/main/java/org/gnunet/gns/GNS.java b/src/main/java/org/gnunet/gns/GNS.java
index 3abc86c..63cd750 100644
--- a/src/main/java/org/gnunet/gns/GNS.java
+++ b/src/main/java/org/gnunet/gns/GNS.java
@@ -24,8 +24,12 @@ import org.gnunet.gns.messages.ClientLookupMessage;
 import org.gnunet.gns.messages.ClientLookupResultMessage;
 import org.gnunet.mq.Envelope;
 import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.RequestContainer;
-import org.gnunet.util.*;
+import org.gnunet.requests.Request;
+import org.gnunet.requests.RequestIdentifier;
+import org.gnunet.util.Cancelable;
+import org.gnunet.util.Client;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.RunaboutMessageReceiver;
 import org.gnunet.util.crypto.EcdsaPrivateKey;
 import org.gnunet.util.crypto.EcdsaPublicKey;
 import org.slf4j.Logger;
@@ -42,7 +46,7 @@ public class GNS {
      */
     private MatchingRequestContainer<Long, LookupRequest> lookupRequests;
 
-    private class LookupRequest extends RequestContainer.Request {
+    private class LookupRequest extends Request {
         long uid;
         String name;
         EcdsaPublicKey zone;
@@ -85,12 +89,13 @@ public class GNS {
 
     public class GNSMessageReceiver extends RunaboutMessageReceiver {
         public void visit(ClientLookupResultMessage m) {
-            LookupRequest r = lookupRequests.pollRequest(m.id);
+            RequestIdentifier<LookupRequest> r = lookupRequests.getRequestIdentifier(m.id);
             if (null == r) {
-                logger.warn("no matching request for lookup result");
+                logger.warn("no matching getRequestIdentifier for lookup result");
                 return;
             }
-            r.proc.process(m.records);
+            r.getRequest().proc.process(m.records);
+            r.retire();
         }
 
         @Override
@@ -132,7 +137,7 @@ public class GNS {
      *                    shorten zone, we automatically add the respective zone
      *                    under that name)
      * @param proc function to call on result
-     * @return handle to the queued request
+     * @return handle to the queued getRequestIdentifier
      */
     public Cancelable lookup(String name,
                              EcdsaPublicKey zone,
diff --git a/src/main/java/org/gnunet/gns/Gns.java b/src/main/java/org/gnunet/gns/Gns.java
index 3175be0..8dd1e9e 100644
--- a/src/main/java/org/gnunet/gns/Gns.java
+++ b/src/main/java/org/gnunet/gns/Gns.java
@@ -23,8 +23,9 @@ package org.gnunet.gns;
 import org.gnunet.gns.callbacks.LookupResultProcessor;
 import org.gnunet.gns.messages.ClientLookupMessage;
 import org.gnunet.gns.messages.ClientLookupResultMessage;
+import org.gnunet.requests.FixedMessageRequest;
 import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.SimpleRequest;
+import org.gnunet.requests.RequestIdentifier;
 import org.gnunet.util.*;
 import org.gnunet.util.crypto.EcdsaPrivateKey;
 import org.gnunet.util.crypto.EcdsaPublicKey;
@@ -40,7 +41,7 @@ public class Gns {
     /**
      * All pending and active lookup requests.
      */
-    private MatchingRequestContainer<Long, SimpleRequest<LookupResultProcessor>> lookupRequests;
+    private MatchingRequestContainer<Long, FixedMessageRequest<LookupResultProcessor>> lookupRequests;
 
     /**
      * Request ID for lookup requests.
@@ -57,12 +58,12 @@ public class Gns {
 
     public class GNSMessageReceiver extends RunaboutMessageReceiver {
         public void visit(ClientLookupResultMessage m) {
-            SimpleRequest<LookupResultProcessor> r = lookupRequests.pollRequest(m.id);
+            RequestIdentifier<FixedMessageRequest<LookupResultProcessor>> r = lookupRequests.getRequestIdentifier(m.id);
             if (null == r) {
-                logger.warn("no matching request for lookup result");
+                logger.warn("no matching getRequestIdentifier for lookup result");
                 return;
             }
-            r.getContext().process(m.records);
+            r.getRequest().getContext().process(m.records);
         }
 
         @Override
@@ -87,7 +88,7 @@ public class Gns {
      */
     public Gns(Configuration cfg) {
         client = new Client("gns", cfg);
-        lookupRequests = new MatchingRequestContainer<Long, SimpleRequest<LookupResultProcessor>>(client);
+        lookupRequests = new MatchingRequestContainer<Long, FixedMessageRequest<LookupResultProcessor>>(client);
         client.installReceiver(new GNSMessageReceiver());
     }
 
@@ -104,7 +105,7 @@ public class Gns {
      *                    shorten zone, we automatically add the respective zone
      *                    under that name)
      * @param proc function to call on result
-     * @return handle to the queued request
+     * @return handle to the queued getRequestIdentifier
      */
     public Cancelable lookup(String name,
                              EcdsaPublicKey zone,
@@ -126,7 +127,7 @@ public class Gns {
         m.type = type;
         m.zone = zone;
 
-        return lookupRequests.addRequest(m.id, new SimpleRequest<LookupResultProcessor>(m, proc));
+        return lookupRequests.addRequest(m.id, new FixedMessageRequest<LookupResultProcessor>(m, proc));
     }
 
 
diff --git a/src/main/java/org/gnunet/gns/GnsRecord.java b/src/main/java/org/gnunet/gns/GnsRecord.java
index 946678c..cd1108f 100644
--- a/src/main/java/org/gnunet/gns/GnsRecord.java
+++ b/src/main/java/org/gnunet/gns/GnsRecord.java
@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
 
 public class GnsRecord implements Message {
diff --git a/src/main/java/org/gnunet/gns/GnsTool.java b/src/main/java/org/gnunet/gns/GnsTool.java
index 81cd6d3..b5879a1 100644
--- a/src/main/java/org/gnunet/gns/GnsTool.java
+++ b/src/main/java/org/gnunet/gns/GnsTool.java
@@ -10,7 +10,7 @@ import org.gnunet.util.getopt.ArgumentAction;
 
 public class GnsTool {
     public static void main(String[] args) {
-        int ret = new Program(args) {
+        int ret = new Program() {
             @Argument(
                     shortname = "u",
                     longname = "lookup",
@@ -75,7 +75,7 @@ public class GnsTool {
                 });
 
             }
-        }.start();
+        }.start(args);
         System.exit(ret);
     }
 }
diff --git a/src/main/java/org/gnunet/gns/LookupResultProcessor.java b/src/main/java/org/gnunet/gns/LookupResultProcessor.java
index 901b2d3..d3e0af0 100644
--- a/src/main/java/org/gnunet/gns/LookupResultProcessor.java
+++ b/src/main/java/org/gnunet/gns/LookupResultProcessor.java
@@ -22,7 +22,7 @@ package org.gnunet.gns;
 
 
 /**
- * Processor for GNS request results.
+ * Processor for GNS getRequestIdentifier results.
  */
 public interface LookupResultProcessor {
     /**
diff --git a/src/main/java/org/gnunet/gns/callbacks/LookupResultProcessor.java b/src/main/java/org/gnunet/gns/callbacks/LookupResultProcessor.java
index daa6d3e..4b00c7e 100644
--- a/src/main/java/org/gnunet/gns/callbacks/LookupResultProcessor.java
+++ b/src/main/java/org/gnunet/gns/callbacks/LookupResultProcessor.java
@@ -23,7 +23,7 @@ package org.gnunet.gns.callbacks;
 import org.gnunet.gns.GnsRecord;
 
 /**
- * Processor for GNS request results.
+ * Processor for GNS getRequestIdentifier results.
  */
 public interface LookupResultProcessor {
     /**
diff --git a/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java b/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java
index c8d7174..b91d377 100644
--- a/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java
+++ b/src/main/java/org/gnunet/gns/messages/ClientLookupMessage.java
@@ -31,7 +31,7 @@ import org.gnunet.util.crypto.EcdsaPublicKey;
 @UnionCase(500)
 public class ClientLookupMessage implements GnunetMessage.Body {
     /**
-     * Unique identifier for this request (for key collisions).
+     * Unique identifier for this getRequestIdentifier (for key collisions).
      */
     @UInt32
     public long id;
diff --git a/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java b/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java
index f9a1ce2..d7d062d 100644
--- a/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java
+++ b/src/main/java/org/gnunet/gns/messages/ClientLookupResultMessage.java
@@ -40,17 +40,19 @@
 
 package org.gnunet.gns.messages;
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.VariableSizeArray;
 import org.gnunet.gns.GnsRecord;
 import org.gnunet.util.GnunetMessage;
 
 /**
- * Message GNS service to client as a response to a lookup request.
+ * Message GNS service to client as a response to a lookup getRequestIdentifier.
  */
 @UnionCase(501)
 public class ClientLookupResultMessage implements GnunetMessage.Body {
     /**
-     * Unique identifier for this request.
+     * Unique identifier for this getRequestIdentifier.
      */
     @UInt32
     public long id;
diff --git a/src/main/java/org/gnunet/identity/Identity.java b/src/main/java/org/gnunet/identity/Identity.java
index 495313c..ca94a20 100644
--- a/src/main/java/org/gnunet/identity/Identity.java
+++ b/src/main/java/org/gnunet/identity/Identity.java
@@ -24,7 +24,8 @@ package org.gnunet.identity;
 import com.google.common.collect.Lists;
 import org.gnunet.identity.messages.*;
 import org.gnunet.mq.Envelope;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
+import org.gnunet.requests.RequestIdentifier;
 import org.gnunet.requests.SequentialRequestContainer;
 import org.gnunet.util.*;
 import org.gnunet.util.crypto.EcdsaPrivateKey;
@@ -124,7 +125,7 @@ public class Identity {
         }
     }
 
-    public abstract class IdentityRequest extends RequestContainer.Request {
+    public abstract class IdentityRequest extends Request {
 
         public void onError(String errorMessage) {
             throw new AssertionError("unexpected error message: " + errorMessage);
@@ -353,7 +354,8 @@ public class Identity {
         }
 
         public void visit(ResultCodeMessage m) {
-            IdentityRequest r = requests.getRequest();
+            RequestIdentifier<IdentityRequest> rId = requests.getRequestIdentifier();
+            IdentityRequest r = rId.getRequest();
             if (null == r) {
                 logger.warn("unsolicited result code message");
                 return;
@@ -363,11 +365,12 @@ public class Identity {
             } else {
                 r.onResult();
             }
-            requests.next();
+            rId.retire();
         }
 
         public void visit(SetDefaultMessage m) {
-            IdentityRequest r = requests.getRequest();
+            RequestIdentifier<IdentityRequest> rId = requests.getRequestIdentifier();
+            IdentityRequest r = rId.getRequest();
             if (!(r instanceof GetDefaultRequest)) {
                 logger.error("unexpected 'default ego' response");
                 return;
@@ -376,6 +379,7 @@ public class Identity {
             Ego ego = getEgoForKey(m.privateKey);
             if (null != ego)
                 gdr.identityCallback.onEgo(ego);
+            rId.retire();
         }
 
         public void visit(final UpdateListMessage m) {
diff --git a/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java b/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
index 12bd55b..717bbb4 100644
--- a/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
+++ b/src/main/java/org/gnunet/identity/messages/ResultCodeMessage.java
@@ -100,7 +100,9 @@
 
 package org.gnunet.identity.messages;
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
 import org.gnunet.util.GnunetMessage;
 
 /**
diff --git a/src/main/java/org/gnunet/mesh/ClientConnectMessage.java b/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
index 7ef36ce..0a76ee1 100644
--- a/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
+++ b/src/main/java/org/gnunet/mesh/ClientConnectMessage.java
@@ -1,6 +1,7 @@
 package org.gnunet.mesh;
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.IntegerFill;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 
 /**
diff --git a/src/main/java/org/gnunet/mesh/ConnectHandler.java b/src/main/java/org/gnunet/mesh/ConnectHandler.java
index 021e8f0..62275b0 100644
--- a/src/main/java/org/gnunet/mesh/ConnectHandler.java
+++ b/src/main/java/org/gnunet/mesh/ConnectHandler.java
@@ -1,6 +1,5 @@
 package org.gnunet.mesh;
 
-import org.gnunet.peerinfo.PeerInfo;
 import org.gnunet.util.PeerIdentity;
 
 /**
diff --git a/src/main/java/org/gnunet/mesh/DataMessage.java b/src/main/java/org/gnunet/mesh/DataMessage.java
index a5ced12..2f7f93f 100644
--- a/src/main/java/org/gnunet/mesh/DataMessage.java
+++ b/src/main/java/org/gnunet/mesh/DataMessage.java
@@ -1,8 +1,10 @@
 package org.gnunet.mesh;
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.FillWith;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt8;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
 
 /**
  * ...
diff --git a/src/main/java/org/gnunet/mesh/MeshRunabout.java b/src/main/java/org/gnunet/mesh/MeshRunabout.java
index bd7819e..50dbe09 100644
--- a/src/main/java/org/gnunet/mesh/MeshRunabout.java
+++ b/src/main/java/org/gnunet/mesh/MeshRunabout.java
@@ -1,6 +1,5 @@
 package org.gnunet.mesh;
 
-import org.gnunet.util.PeerIdentity;
 import org.grothoff.Runabout;
 
 /**
diff --git a/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java b/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
index b6e2fc9..b2a4c4f 100644
--- a/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
+++ b/src/main/java/org/gnunet/mesh/TunnelDestroyMessage.java
@@ -1,11 +1,9 @@
 package org.gnunet.mesh;
 
 import org.gnunet.construct.FixedSizeIntegerArray;
-import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
 
 /**
  * ...
diff --git a/src/main/java/org/gnunet/mq/Envelope.java b/src/main/java/org/gnunet/mq/Envelope.java
index d54af80..e800fee 100644
--- a/src/main/java/org/gnunet/mq/Envelope.java
+++ b/src/main/java/org/gnunet/mq/Envelope.java
@@ -26,10 +26,10 @@ public class Envelope implements Cancelable {
 
     public void cancel() {
         if (parentQueue == null)
-            throw new AssertionError("can not cancel an unqueued message");
+            throw new AssertionError("can not onCancel an unqueued message");
     }
 
-    /* pkg-private */ void invokeSentNotification() {
+    void invokeSentNotification() {
         if (null != notifySentHandler)
             notifySentHandler.onSent();
     }
diff --git a/src/main/java/org/gnunet/mq/MessageQueue.java b/src/main/java/org/gnunet/mq/MessageQueue.java
index cdc6354..d7ecce7 100644
--- a/src/main/java/org/gnunet/mq/MessageQueue.java
+++ b/src/main/java/org/gnunet/mq/MessageQueue.java
@@ -88,7 +88,7 @@ public abstract class MessageQueue {
     /**
      * Cancel sending an envelope. The envelope must be queued in this message queue.
      *
-     * @param ev the envelope to cancel
+     * @param ev the envelope to onCancel
      */
     /* pkg-private */ void cancelEnvelope(Envelope ev) {
         if (null == currentEnvelope)
diff --git a/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java b/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java
index 5fc7453..05f80f2 100644
--- a/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java
+++ b/src/main/java/org/gnunet/nse/NetworkSizeEstimation.java
@@ -83,7 +83,7 @@ public class NetworkSizeEstimation {
 
 
     /**
-     * A handle for a subscription to the network size estimation service, may be used to cancel the
+     * A handle for a subscription to the network size estimation service, may be used to onCancel the
      * subscription.
      */
     public class Subscription implements Cancelable {
@@ -112,7 +112,7 @@ public class NetworkSizeEstimation {
      * Subscribe for updates from the service.
      *
      * @param s callback for updates
-     * @return a subscription handle that may be used to cancel the subscription
+     * @return a subscription handle that may be used to onCancel the subscription
      */
     public Cancelable subscribe(Subscriber s) {
         subscribers.add(s);
@@ -141,7 +141,7 @@ public class NetworkSizeEstimation {
     }
 
     public static void main(String[] args) {
-        new Program(args) {
+        new Program() {
             @Argument(action = ArgumentAction.SET,
                     shortname = "w",
                     longname = "watch",
@@ -162,6 +162,6 @@ public class NetworkSizeEstimation {
                 };
                 svc.subscribe(subscriber);
             }
-        }.start();
+        }.start(args);
     }
 }
diff --git a/src/main/java/org/gnunet/nse/UpdateMessage.java b/src/main/java/org/gnunet/nse/UpdateMessage.java
index 5c64a54..c83b740 100644
--- a/src/main/java/org/gnunet/nse/UpdateMessage.java
+++ b/src/main/java/org/gnunet/nse/UpdateMessage.java
@@ -1,7 +1,9 @@
 package org.gnunet.nse;
 
-import org.gnunet.construct.*;
 import org.gnunet.construct.DoubleValue;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.AbsoluteTimeMessage;
 import org.gnunet.util.GnunetMessage;
 
diff --git a/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java b/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
index 7d175ca..f1cbd7e 100644
--- a/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
+++ b/src/main/java/org/gnunet/peerinfo/ListAllPeersMessage.java
@@ -20,11 +20,9 @@
 
 package org.gnunet.peerinfo;
 
-import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
 
 /**
  * Message requesting a listing of all known peers,
diff --git a/src/main/java/org/gnunet/peerinfo/PeerInfo.java b/src/main/java/org/gnunet/peerinfo/PeerInfo.java
index ea099ac..2304c5d 100644
--- a/src/main/java/org/gnunet/peerinfo/PeerInfo.java
+++ b/src/main/java/org/gnunet/peerinfo/PeerInfo.java
@@ -22,7 +22,7 @@ package org.gnunet.peerinfo;
 
 import org.gnunet.hello.HelloMessage;
 import org.gnunet.mq.Envelope;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
 import org.gnunet.requests.SequentialRequestContainer;
 import org.gnunet.util.*;
 import org.slf4j.Logger;
@@ -47,7 +47,7 @@ public class PeerInfo {
      */
     private SequentialRequestContainer<PeerIterateRequest> iterateRequests;
 
-    private class PeerIterateRequest extends RequestContainer.Request {
+    private class PeerIterateRequest extends Request {
         public PeerIdentity peer;
         public PeerProcessor peerProcessor;
         public boolean friendOnly;
@@ -72,17 +72,16 @@ public class PeerInfo {
             }
         }
 
-        public void cancel() {
+        public void onCancel() {
             canceled = true;
         }
     }
 
     private class PeerInfoMessageReceiver extends RunaboutMessageReceiver {
         public void visit(InfoEnd infoEnd) {
-            PeerIterateRequest r = iterateRequests.getRequest();
+            PeerIterateRequest r = iterateRequests.getAndRetireRequest();
             if (!r.canceled)
                 r.peerProcessor.onEnd();
-            iterateRequests.next();
         }
         public void visit(InfoMessage infoMessage) {
             PeerIterateRequest r = iterateRequests.getRequest();
@@ -102,9 +101,6 @@ public class PeerInfo {
         client = new Client("peerinfo", cfg);
         client.installReceiver(new PeerInfoMessageReceiver());
         iterateRequests = new SequentialRequestContainer<PeerIterateRequest>(client);
-        // Make sure that new requests are only sent once the old request has finished.
-        // Otherwise, the peerinfo service would send the answers interleaved.
-        iterateRequests.setOverlap(false);
     }
 
     /**
@@ -136,7 +132,7 @@ public class PeerInfo {
     }
 
     public static void main(String... args) {
-        new Program(args) {
+        new Program() {
             @Override
             public void run() {
                 final PeerInfo peerInfo = new PeerInfo(getConfiguration());
@@ -153,6 +149,6 @@ public class PeerInfo {
                     }
                 });
             }
-        }.start();
+        }.start(args);
     }
 }
diff --git a/src/main/java/org/gnunet/requests/MatchingRequestContainer.java b/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
index b2c671e..04b17fd 100644
--- a/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
+++ b/src/main/java/org/gnunet/requests/MatchingRequestContainer.java
@@ -1,3 +1,24 @@
+/*
+ This file is part of GNUnet.
+ (C) 2014 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+
 package org.gnunet.requests;
 
 import com.google.common.collect.Maps;
@@ -8,13 +29,13 @@ import java.util.Map;
 
 
 /**
- * Container for requests that are responded to with a matching request identification
+ * Container for requests that are responded to with a matching getRequestIdentifier identification
  */
-public class MatchingRequestContainer<K, T extends RequestContainer.Request> extends RequestContainer {
+public class MatchingRequestContainer<K, T extends Request> extends RequestContainer {
     /**
      * All queued requests.
      */
-    private Map<K,T> requests = Maps.newHashMap();
+    private Map<K,Identifier> requests = Maps.newHashMap();
 
     /**
      * Message queue to send to requests over.
@@ -25,48 +46,48 @@ public class MatchingRequestContainer<K, T extends RequestContainer.Request> ext
         this.mq = mq;
     }
 
+    private class Identifier extends SimpleRequestIdentifier<T> {
+        final K key;
+
+        public Identifier(T request, K key) {
+            super(request);
+            this.key = key;
+        }
+
+        @Override
+        public void retire() {
+            super.retire();
+            requests.remove(key);
+        }
+    }
+
     public Cancelable addRequest(K key, final T request) {
         if (requests.containsKey(key))
-            throw new AssertionError("key already present in request container");
-        requests.put(key, request);
-        mq.send(request.assembleRequest());
-        return new Cancelable() {
-            @Override
-            public void cancel() {
-                setRequestCancelled(request);
-                if (isRequestTransmitting(request)) {
-                    cancelRequestTransmission(request);
-                } else {
-                    request.cancel();
-                }
-            }
-        };
+            throw new AssertionError("key already present in getRequestIdentifier container");
+        Identifier identifier = new Identifier(request, key);
+        requests.put(key, identifier);
+        identifier.send(mq);
+        return identifier;
     }
 
     @Override
     public void restart() {
-        Map<K,T> requestsOld = requests;
+        Map<K, Identifier> requestsOld = requests;
         requests = Maps.newHashMap();
-        for (Map.Entry<K,T> e : requestsOld.entrySet()) {
-            if (!isRequestCancelled(e.getValue())) {
-                setRequestTransmitting(e.getValue(), false);
-                addRequest(e.getKey(), e.getValue());
-            }
+        for (Map.Entry<K,Identifier> e : requestsOld.entrySet()) {
+            addRequest(e.getKey(), e.getValue().getRequest());
         }
     }
 
-    public T getRequest(K key) {
+    public RequestIdentifier<T> getRequestIdentifier(K key) {
         return requests.get(key);
     }
 
-    /**
-     * Retrieve the request matching the given key, and remove it.
-     * Return null if there is no matching request.
-     *
-     * @param key key to look for
-     * @return request, or null
-     */
-    public T pollRequest(K key) {
-        return requests.remove(key);
+    public T getAndRetireRequest(K key) {
+        RequestIdentifier<T> i = getRequestIdentifier(key);
+        if (null == i)
+            return null;
+        i.retire();
+        return i.getRequest();
     }
 }
diff --git a/src/main/java/org/gnunet/requests/RequestContainer.java b/src/main/java/org/gnunet/requests/RequestContainer.java
index 8fc631e..9c7fb48 100644
--- a/src/main/java/org/gnunet/requests/RequestContainer.java
+++ b/src/main/java/org/gnunet/requests/RequestContainer.java
@@ -1,90 +1,31 @@
-package org.gnunet.requests;
-
+/*
+ This file is part of GNUnet.
+ (C) 2014 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
 
-import org.gnunet.mq.Envelope;
-import org.gnunet.util.Cancelable;
+package org.gnunet.requests;
 
 /**
  * Container for requests to a service.
  */
 public abstract class RequestContainer {
     /**
-     * Do we allow sending pending requests while
-     * other requests are still active (true), or do we send
-     * requests one-by-one (false)?
-     */
-    protected boolean overlap = true;
-
-    /**
-     * A request that can be put in a request container.
-     */
-    public abstract static class Request {
-        private boolean transmitting;
-        private boolean canceled;
-        private Cancelable cancelRequest;
-
-        /**
-         * Create an envelope for executing the request.
-         *
-         * @return Envelope to be sent to the service with the request message.
-         */
-        public abstract Envelope assembleRequest();
-
-        /**
-         * Implement cancellation logic for requests.
-         * Only called when the request has already been sent to the service.
-         *
-         * By default, canceling a request throws an exception.
-         */
-        public void cancel() {
-            throw new AssertionError("request of type " + this.getClass() + " can not be canceled (not implemented)");
-        }
-    }
-
-    /**
-     * Re-send all requests in the queue that have not been canceled.
+     * Re-send all active and pending requests.
      */
     public abstract void restart();
-
-    /**
-     * Allow or disallow requests to be send while other requests in the queue have not been completed.
-     *
-     * @param overlap true to allow overlapped requests, false to disallow them
-     */
-    public void setOverlap(boolean overlap) {
-        this.overlap = overlap;
-    }
-
-    /**
-     * Check if the given request is transmitting, that is, the request
-     * is waiting to be sent to the service.
-     *
-     * @param r request
-     * @return whether the request is still being transmitted
-     */
-    protected boolean isRequestTransmitting(Request r) {
-        return r.transmitting;
-    }
-
-    protected void setRequestTransmitting(Request r, boolean transmitting) {
-        r.transmitting = transmitting;
-    }
-
-    protected void setRequestTransmissionCancel(Request request, Cancelable cancel) {
-        request.cancelRequest = cancel;
-    }
-
-    protected void cancelRequestTransmission(Request r) {
-        r.cancelRequest.cancel();
-        r.cancelRequest = null;
-    }
-
-    protected void setRequestCancelled(Request r) {
-        r.canceled = true;
-    }
-
-    protected boolean isRequestCancelled(Request r) {
-        return r.canceled;
-    }
-
 }
diff --git a/src/main/java/org/gnunet/requests/SequentialRequestContainer.java b/src/main/java/org/gnunet/requests/SequentialRequestContainer.java
index 037055f..c343812 100644
--- a/src/main/java/org/gnunet/requests/SequentialRequestContainer.java
+++ b/src/main/java/org/gnunet/requests/SequentialRequestContainer.java
@@ -1,86 +1,153 @@
+/*
+ This file is part of GNUnet.
+ (C) 2014 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
 package org.gnunet.requests;
 
-import org.gnunet.mq.Envelope;
 import org.gnunet.mq.MessageQueue;
-import org.gnunet.mq.NotifySentHandler;
-import org.gnunet.util.Cancelable;
 
 import java.util.LinkedList;
 
 /**
  * Container for requests that are responded to in sequential order.
  */
-public class SequentialRequestContainer<T extends RequestContainer.Request> extends RequestContainer {
-    private LinkedList<T> requests = new LinkedList<T>();
-    private MessageQueue mq;
+public class SequentialRequestContainer<T extends Request> extends RequestContainer {
+    /**
+     * Allow overlapping requests.
+     */
+    private boolean overlap;
+    /**
+     * Request in our queue with information about them.
+     */
+    private LinkedList<Identifier> requests = new LinkedList<Identifier>();
+    /**
+     * Message queue that is used to send envelopes.
+     */
+    private final MessageQueue mq;
 
-    int requestsActive = 0;
+    /**
+     * Number of active requests.
+     */
+    private int requestsActive = 0;
 
-    public SequentialRequestContainer(MessageQueue mq) {
+    /**
+     * Create a sequential request container that sends messages with the given
+     * message queue.
+     *
+     * @param mq message queue to send messages with
+     * @param overlap allow sending requests while other request have not yet completed
+     */
+    public SequentialRequestContainer(MessageQueue mq, boolean overlap) {
         this.mq = mq;
+        this.overlap = overlap;
+    }
+    /**
+     * Create a sequential request container that sends messages with the given
+     * message queue.  Do not allow other requests to be send while the current request
+     * is still active.
+     *
+     * @param mq message queue to send messages with
+     */
+    public SequentialRequestContainer(MessageQueue mq) {
+       this(mq, false);
+    }
+    /**
+     * Get the current request's identifier.
+     *
+     * @return current request
+     */
+    public RequestIdentifier<T> getRequestIdentifier() {
+        return requests.peekFirst();
     }
 
+    /**
+     * Get the current request and retire it.
+     * If there is no current request, null will be returned.
+     *
+     * @return current request
+     */
+    public T getAndRetireRequest() {
+        RequestIdentifier<T> i = getRequestIdentifier();
+        if (null == i)
+            return null;
+        i.retire();
+        return i.getRequest();
+    }
+
+    public Iterable<RequestIdentifier<T>> iter() {
+        return (Iterable) requests;
+    }
+
+    /**
+     * Get the current request.
+     *
+     * @return the current request.
+     */
     public T getRequest() {
-        return requests.getFirst();
+        RequestIdentifier<T> i = getRequestIdentifier();
+        if (null == i)
+            return null;
+        return i.getRequest();
     }
 
-    public void next() {
-        if (requestsActive == 0 || requests.isEmpty())
-            throw new AssertionError();
-        requestsActive--;
-        requests.removeFirst();
-        if (requestsActive == 0 && !requests.isEmpty()) {
-            Request r = requests.getFirst();
-            setRequestTransmitting(r, true);
-            Envelope ev = r.assembleRequest();
-            setRequestTransmissionCancel(r, ev);
-            mq.send(r.assembleRequest());
-            requestsActive++;
+    /**
+     * A request identifier in a sequential request container.
+     */
+    private class Identifier extends SimpleRequestIdentifier<T> {
+        public Identifier(T request) {
+            super(request);
+        }
+
+        @Override
+        public void retire() {
+            super.retire();
+            if (requestsActive == 0 || requests.isEmpty())
+                throw new AssertionError();
+            boolean found = requests.remove(this);
+            if (!found)
+                throw new AssertionError("request not in queue");
+            requestsActive--;
+            Identifier next = requests.peekFirst();
+            if (null == next || next.queued)
+                return;
+            if (requestsActive == 0 || overlap)
+                next.send(mq);
         }
     }
 
-    public Cancelable addRequest(final T request) {
-        requests.addLast(request);
+    public RequestIdentifier<T> addRequest(final T request) {
+        final Identifier identifier = new Identifier(request);
+        requests.addLast(identifier);
+        // only send immediately if we are allowed to
         if (overlap || requestsActive == 0) {
-            requestsActive++;
-            setRequestTransmitting(request, true);
-            Envelope ev = request.assembleRequest();
-            ev.notifySent(new NotifySentHandler() {
-                @Override
-                public void onSent() {
-                    setRequestTransmitting(request, false);
-                }
-            });
-            setRequestTransmissionCancel(request, ev);
-            mq.send(request.assembleRequest());
+            identifier.send(mq);
+            requestsActive += 1;
         }
-        return new Cancelable() {
-            @Override
-            public void cancel() {
-                setRequestCancelled(request);
-                if (isRequestTransmitting(request)) {
-                    cancelRequestTransmission(request);
-                } else {
-                    request.cancel();
-                }
-            }
-        };
+        return identifier;
     }
 
     @Override
     public void restart() {
-        LinkedList<T> requestsOld = requests;
-        requests = new LinkedList<T>();
-        for (T r : requestsOld) {
-            if (!isRequestCancelled(r)) {
-                setRequestTransmitting(r, false);
-                addRequest(r);
-            }
+        LinkedList<Identifier> requestsOld = requests;
+        requests = new LinkedList<Identifier>();
+        for (Identifier r : requestsOld) {
+            addRequest(r.getRequest());
         }
     }
-
-
-    public Iterable<T> iter() {
-        return requests;
-    }
 }
diff --git a/src/main/java/org/gnunet/requests/package-info.java b/src/main/java/org/gnunet/requests/package-info.java
index 892a606..b4fd674 100644
--- a/src/main/java/org/gnunet/requests/package-info.java
+++ b/src/main/java/org/gnunet/requests/package-info.java
@@ -1,6 +1,6 @@
 /*
  This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2014 Christian Grothoff (and other contributing authors)
 
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
@@ -18,7 +18,6 @@
  Boston, MA 02111-1307, USA.
  */
 
-
 /**
  * General mechanism for queueing requests to a service.
  */
diff --git a/src/main/java/org/gnunet/secretsharing/Ciphertext.java b/src/main/java/org/gnunet/secretsharing/Ciphertext.java
index b940f21..d60e8ce 100644
--- a/src/main/java/org/gnunet/secretsharing/Ciphertext.java
+++ b/src/main/java/org/gnunet/secretsharing/Ciphertext.java
@@ -28,7 +28,7 @@ import org.gnunet.util.Strings;
 import java.math.BigInteger;
 
 /**
- * ElGamal ciphertext
+ * ElGamal ciphertext.
  */
 public class Ciphertext implements Message {
     @FixedSizeIntegerArray(signed = true, bitSize = 8, length = Parameters.elgamalBits / 8)
@@ -82,4 +82,17 @@ public class Ciphertext implements Message {
                 Parameters.elgamalBits);
         return ciphertext;
     }
+
+    /**
+     * Get the ciphertext that is the identity for multiplication.
+     *
+     * @return multiplicative identity ciphertext
+     */
+    public static Ciphertext identity() {
+        Ciphertext ciphertext = new Ciphertext();
+        ciphertext.allocate();
+        ciphertext.c_1 = BigIntegers.serializeUnsigned(BigInteger.ONE, Parameters.elgamalBits);
+        ciphertext.c_2 = BigIntegers.serializeUnsigned(BigInteger.ONE, Parameters.elgamalBits);
+        return ciphertext;
+    }
 }
diff --git a/src/main/java/org/gnunet/secretsharing/KeyGeneration.java b/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
index 8b9a759..72d13b1 100644
--- a/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
+++ b/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
@@ -76,7 +76,7 @@ public class KeyGeneration {
     }
 
     /**
-     * Disconnect from the secretsharing service and cancel the operation.
+     * Disconnect from the secretsharing service and onCancel the operation.
      * The SecretReadyCallback will not be called after calling disconnect.
      */
     public void disconnect() {
diff --git a/src/main/java/org/gnunet/secretsharing/Plaintext.java b/src/main/java/org/gnunet/secretsharing/Plaintext.java
index c2eacc2..fc4ac14 100644
--- a/src/main/java/org/gnunet/secretsharing/Plaintext.java
+++ b/src/main/java/org/gnunet/secretsharing/Plaintext.java
@@ -20,7 +20,6 @@
 
 package org.gnunet.secretsharing;
 
-import com.google.common.base.Preconditions;
 import org.gnunet.construct.FixedSizeIntegerArray;
 import org.gnunet.construct.Message;
 import org.gnunet.util.BigIntegers;
@@ -42,13 +41,13 @@ public class Plaintext implements Message {
 
     public long bruteForceDiscreteLog(final long l) {
         BigInteger needle = new BigInteger(1, bits);
-        for (long i = -l; i < l; i++) {
+        for (long i = -l; i <= l; i++) {
             BigInteger val;
             val = Parameters.elgamalG.modPow(BigInteger.valueOf(l), Parameters.elgamalP);
             if (val.equals(needle))
                 return i;
         }
-        throw new ArithmeticException("discrete log has no solution in given range");
+        throw new ArithmeticException(String.format("discrete log has no solution in range [%s, %s]", -l, l));
     }
 
     public Ciphertext encrypt(ThresholdPublicKey publicKey) {
diff --git a/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java b/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java
index 1dc0981..bfe2efc 100644
--- a/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java
+++ b/src/main/java/org/gnunet/secretsharing/messages/ClientDecryptMessage.java
@@ -28,7 +28,7 @@ import org.gnunet.util.AbsoluteTimeMessage;
 import org.gnunet.util.GnunetMessage;
 
 /**
- * Sent by the client to the service to request the cooperative decryption of a
+ * Sent by the client to the service to getRequestIdentifier the cooperative decryption of a
  * ciphertext.
  */
 @UnionCase(781)
diff --git a/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java b/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java
index b1ce6b2..135b254 100644
--- a/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java
+++ b/src/main/java/org/gnunet/secretsharing/messages/GenerateMessage.java
@@ -26,7 +26,10 @@ import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt16;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.VariableSizeArray;
-import org.gnunet.util.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
 
 
 @UnionCase(780)
diff --git a/src/main/java/org/gnunet/statistics/GetRequest.java b/src/main/java/org/gnunet/statistics/GetRequest.java
index 8f421b1..42ca0bb 100644
--- a/src/main/java/org/gnunet/statistics/GetRequest.java
+++ b/src/main/java/org/gnunet/statistics/GetRequest.java
@@ -1,16 +1,13 @@
 package org.gnunet.statistics;
 
 import org.gnunet.mq.Envelope;
-import org.gnunet.mq.MessageQueue;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
+import org.gnunet.statistics.messages.GetMessage;
 
-/**
- */
-public class GetRequest extends RequestContainer.Request {
+class GetRequest extends Request {
     private final String subsystem;
     private final String name;
     public final StatisticsReceiver receiver;
-    private RequestContainer parent;
 
     public GetRequest(String subsystem, String name, StatisticsReceiver receiver) {
         this.subsystem = subsystem;
@@ -27,5 +24,6 @@ public class GetRequest extends RequestContainer.Request {
     }
 
     public void cancel() {
+        // nothing we can do here (statistics service has no message to cancel requests)
     }
 }
diff --git a/src/main/java/org/gnunet/statistics/Statistics.java b/src/main/java/org/gnunet/statistics/Statistics.java
index d06b627..d8b8f3e 100644
--- a/src/main/java/org/gnunet/statistics/Statistics.java
+++ b/src/main/java/org/gnunet/statistics/Statistics.java
@@ -18,19 +18,17 @@
  Boston, MA 02111-1307, USA.
  */
 
-/*
- * The stuff below does nothing whatsoever, first milestone of
- * this project is to implement the StatisticsService api
- * 
- */
-
 package org.gnunet.statistics;
 
 import org.gnunet.requests.MatchingRequestContainer;
+import org.gnunet.requests.RequestIdentifier;
 import org.gnunet.requests.SequentialRequestContainer;
+import org.gnunet.requests.TimeoutHandler;
+import org.gnunet.statistics.messages.GetResponseEndMessage;
+import org.gnunet.statistics.messages.GetResponseMessage;
+import org.gnunet.statistics.messages.SetMessage;
+import org.gnunet.statistics.messages.WatchResponseMessage;
 import org.gnunet.util.*;
-import org.gnunet.util.getopt.Argument;
-import org.gnunet.util.getopt.ArgumentAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,39 +46,68 @@ public class  Statistics {
     /**
      * Client connecting us to the statistics service.
      */
-    private final Client client;
+    private Client client;
 
-    SequentialRequestContainer<SetRequest> setRequests;
-    SequentialRequestContainer<GetRequest> getRequests;
-    MatchingRequestContainer<Long,WatchRequest> watchRequests;
+    /**
+     * All request to the service for getting a value.
+     */
+    private final SequentialRequestContainer<GetRequest> getRequests;
 
+    /**
+     * All requests to the service for watching a value.
+     */
+    private final MatchingRequestContainer<Long,WatchRequest> watchRequests;
+
+    /**
+     * Do we wait for the final 'TestMessage' from the service and
+     * do not accept any new requests?
+     */
     private boolean destroyRequested;
 
-    private long wid = 0;
+    /**
+     * Next unused ID to identity watch requests/responses.
+     */
+    private long nextWatchId = 0;
+
+    /**
+     * Timeout when waiting for the TestMessage after destruction of
+     * this statistics handle has been requested.
+     */
+    private Scheduler.TaskIdentifier destroyTimeout;
 
+    /**
+     * Messages from the statistics service are dispatched to an instance of this class.
+     */
     public class StatisticsMessageReceiver extends RunaboutMessageReceiver {
         public void visit(GetResponseMessage m) {
-            GetRequest r = getRequests.getRequest();
+            RequestIdentifier<GetRequest> r = getRequests.getRequestIdentifier();
             if (r != null)
-                    r.receiver.onReceive(m.subsystemName, m.statisticName, m.value);
+                    r.getRequest().receiver.onReceive(m.subsystemName, m.statisticName, m.value);
         }
 
-        public void visit(GetResponseEndMessage m) {
-            GetRequest r = getRequests.getRequest();
-            if (r != null)
-                r.receiver.onDone();
-            //noinspection ConstantConditions
-            if (getRequests != null)
-                getRequests.next();
+        public void visit(@SuppressWarnings("UnusedParameters") GetResponseEndMessage m) {
+            RequestIdentifier<GetRequest> r = getRequests.getRequestIdentifier();
+            if (r != null) {
+                r.retire();
+                r.getRequest().receiver.onDone();
+            }
         }
 
-        public void visit(TestMessage m) {
-            System.out.println("got back TEST message");
+        public void visit(@SuppressWarnings("UnusedParameters") TestMessage m) {
+            // The TestMessage indicates that the statistics service received all our
+            // messages, we can disconnect.
+            if (null != destroyTimeout) {
+                destroyTimeout.cancel();
+                destroyTimeout = null;
+            } else {
+                logger.error("protocol violation: destroy timeout is 'null' but got test message");
+            }
             client.disconnect();
         }
 
         public void visit(WatchResponseMessage wrm) {
-            WatchRequest r = watchRequests.getRequest((long) wrm.wid);
+            RequestIdentifier<WatchRequest> ri = watchRequests.getRequestIdentifier((long) wrm.wid);
+            WatchRequest r = ri.getRequest();
             if (r != null) {
                 r.watcher.onReceive(r.subsystem, r.name, wrm.value);
             }
@@ -88,12 +115,19 @@ public class  Statistics {
 
         @Override
         public void handleError() {
+            if (null == client)
+                throw new AssertionError();
             if (!destroyRequested) {
                 client.reconnect();
                 getRequests.restart();
-                setRequests.restart();
                 watchRequests.restart();
             }
+            // if everything is shutting down, maybe the statistics service
+            // was shut down, and can't respond with the TestMessage anymore.
+            if (null != destroyTimeout) {
+                destroyTimeout.cancel();
+                destroyTimeout = null;
+            }
         }
     }
 
@@ -101,26 +135,32 @@ public class  Statistics {
         client = new Client("statistics", cfg);
         client.installReceiver(new StatisticsMessageReceiver());
         getRequests = new SequentialRequestContainer<GetRequest>(client);
-        setRequests = new SequentialRequestContainer<SetRequest>(client);
         watchRequests = new MatchingRequestContainer<Long, WatchRequest>(client);
     }
 
     /**
      * Retrieve values from statistics.
-     * Only one instance of this request may be active simultaneously.
+     * Only one instance of this getRequestIdentifier may be active simultaneously.
      * Upon cancellation
      *
      * @param timeout      time after we give up and call receiver.onTimeout
      * @param subsystem    the subsystem of interest
      * @param name         name of the statistics value belongs to
      * @param receiver     callback
-     * @return handle to cancel the request
+     * @return handle to onCancel the getRequestIdentifier
      */
     public Cancelable get(RelativeTime timeout, final String subsystem, final String name,
                           final StatisticsReceiver receiver) {
-        if (destroyRequested)
+        if (destroyRequested || client == null)
             throw new AssertionError("already destroyed");
-        return getRequests.addRequest(new GetRequest(subsystem, name, receiver));
+        RequestIdentifier<GetRequest> identifier = getRequests.addRequest(new GetRequest(subsystem, name, receiver));
+        identifier.setTimeout(timeout, new TimeoutHandler() {
+            @Override
+            public void onTimeout() {
+                receiver.onTimeout();
+            }
+        });
+        return identifier;
     }
 
     /**
@@ -129,12 +169,17 @@ public class  Statistics {
      * @param name    name of the entry
      * @param value   desired value
      * @param persist keep value even if the statistics service restarts
-     * @return a handle to cancel the request
      */
-    public Cancelable set(final String subsystem, final String name, final long value, boolean persist) {
-        if (destroyRequested)
+    public void set(final String subsystem, final String name, final long value, boolean persist) {
+        if (destroyRequested || client == null)
             throw new AssertionError("already destroyed");
-        return setRequests.addRequest(new SetRequest(subsystem, name, value, false, persist));
+        SetMessage m = new SetMessage();
+        m.statisticName = name;
+        m.subsystemName = subsystem;
+        m.value = value;
+        if (persist)
+            m.flags |= SetMessage.SETFLAG_PERSIST;
+        client.send(m);
     }
 
     /**
@@ -143,12 +188,18 @@ public class  Statistics {
      * @param name    name of the entry
      * @param delta   relative difference to the old value
      * @param persist keep value even if the statistics service restarts
-     * @return a handle to cancel the request
      */
-    public Cancelable update(final String subsystem, final String name, final long delta, boolean persist) {
-        if (destroyRequested)
+    public void update(final String subsystem, final String name, final long delta, boolean persist) {
+        if (destroyRequested || null == client)
             throw new AssertionError("already destroyed");
-        return setRequests.addRequest(new SetRequest(subsystem, name, delta, true, persist));
+        SetMessage m = new SetMessage();
+        m.statisticName = name;
+        m.subsystemName = subsystem;
+        m.value = delta;
+        if (persist)
+            m.flags |= SetMessage.SETFLAG_PERSIST;
+        m.flags |= SetMessage.SETFLAG_RELATIVE;
+        client.send(m);
     }
 
     /**
@@ -157,154 +208,48 @@ public class  Statistics {
      * @param subsystem the subsystem to watch
      * @param name the value to watch
      * @param watcher the object that receives the updates
-     * @return a handle to cancel the request
+     * @return a handle to onCancel the getRequestIdentifier
      */
     public Cancelable watch(final String subsystem, final String name, StatisticsWatcher watcher) {
-        if (destroyRequested)
+        if (destroyRequested || null == client)
             throw new AssertionError("already destroyed");
         WatchRequest r = new WatchRequest(subsystem, name, watcher);
-        return watchRequests.addRequest(wid++, r);
+        return watchRequests.addRequest(nextWatchId++, r);
     }
 
+
     /**
      * Destroy handle to the statistics service. Always finishes writing pending values.
      */
     public void destroy() {
-        destroyRequested = true;
-        client.send(new TestMessage());
-        // wait until the service responds
-        // TODO: or timeout
-        System.out.println("destroying statistics");
+      destroy(true);
     }
 
-
     /**
-     * Statistics command line utility entry point
+     * Destroy handle to the statistics service. Always finishes writing pending values.
      *
-     * @param args command line arguments
+     * @param syncFirst Wait until the statistics service has received all our updates.
      */
-    public static void main(String[] args) {
-        new Program(args) {
-            @Argument(
-                    shortname = "x",
-                    longname = "set",
-                    action = ArgumentAction.SET,
-                    description = "watch a value")
-            boolean set;
-            @Argument(
-                    shortname = "w",
-                    longname = "watch",
-                    action = ArgumentAction.SET,
-                    description = "set a value")
-            boolean watch;
-            @Argument(
-                    shortname = "n",
-                    longname = "name",
-                    action = ArgumentAction.STORE_STRING,
-                    argumentName = "NAME",
-                    description = "statistics name")
-            String statisticsName = "";
-            @Argument(
-                    shortname = "s",
-                    longname = "subsystem",
-                    argumentName = "SUBSYS",
-                    action = ArgumentAction.STORE_STRING,
-                    description = "subsystem name")
-            String subsystemName = "";
-            @Argument(
-                    shortname = "p",
-                    longname = "persistent",
-                    action = ArgumentAction.SET,
-                    description = "set value persistently (used with -x)")
-            boolean persistent = false;
-            @Argument(
-                    shortname = "r",
-                    longname = "relative",
-                    action = ArgumentAction.SET,
-                    description = "set value relative to old value (used with -x)")
-            boolean relative = false;
-
+    public void destroy(boolean syncFirst) {
+        if (destroyRequested)
+            throw new AssertionError("already destroyed");
+        destroyRequested = true;
+        logger.debug("destroying statistics");
+        if (!syncFirst || !client.isConnected()) {
+            client.disconnect();
+            client = null;
+            return;
+        }
+        client.send(new TestMessage());
+        // wait until the service responds or a timeout occurs
+        destroyTimeout = Scheduler.addDelayed(RelativeTime.fromSeconds(5), new Scheduler.Task() {
             @Override
-            protected String makeHelpText() {
-                return "Get, set and watch GNUnet's statistics.";
-            }
-
-            public void run() {
-                final Statistics statistics = new Statistics(cfg);
-
-                if (set && watch) {
-                    System.err.println("--watch/-w and --set/-s cannot be used together");
-                    return;
-                }
-
-                if (set) {
-                    if (subsystemName.isEmpty() || statisticsName.isEmpty()) {
-                        System.err.println("both subsystem and name must be given for --set/-x");
-                        return;
-                    }
-                    if (unprocessedArgs.length != 1) {
-                        System.err.println("must specify exactly one value to set");
-                        return;
-                    }
-                    long value;
-                    try {
-                        value = Long.parseLong(unprocessedArgs[0]);
-                    } catch (NumberFormatException e) {
-                        System.err.println("invalid value (not a long)");
-                        return;
-                    }
-                    if (relative)
-                        statistics.update(subsystemName, statisticsName, value, persistent);
-                     else
-                        statistics.set(subsystemName, statisticsName, value, persistent);
-                    statistics.destroy();
+            public void run(Scheduler.RunContext ctx) {
+                if (null == client)
                     return;
-                }
-
-                if (unprocessedArgs.length != 0) {
-                    System.err.println("dumping statistics does not take any positional parameters");
-                    return;
-                }
-
-                if (watch) {
-                    if (subsystemName.isEmpty() || statisticsName.isEmpty()) {
-                        System.err.println("both subsystem and name must be given for --watch/-w");
-                        return;
-                    }
-                    statistics.watch(subsystemName, statisticsName,
-                            new StatisticsWatcher() {
-                                @Override
-                                public void onReceive(String subsystem, String name, long value) {
-                                    System.out.println(subsystem + "(" + name + ") = " + value);
-                                }
-
-                                @Override
-                                public void onTimeout() {
-                                   System.err.println("timeout");
-                                }
-                            }
-                    );
-                } else {
-                    statistics.get(RelativeTime.SECOND, subsystemName, statisticsName,
-                            new StatisticsReceiver() {
-                                @Override
-                                public void onReceive(String subsystem, String name, long value) {
-                                    System.out.println(subsystem + "(" + name + ") = " + value);
-                                }
-
-                                @Override
-                                public void onTimeout() {
-                                    System.err.println("timeout");
-                                }
-
-                                @Override
-                                public void onDone() {
-                                    statistics.destroy();
-                                }
-                            }
-                    );
-                }
+                client.disconnect();
+                client = null;
             }
-        }.start();
+        });
     }
 }
diff --git a/src/main/java/org/gnunet/statistics/StatisticsWatcher.java b/src/main/java/org/gnunet/statistics/StatisticsWatcher.java
index b6c5f9e..11328b7 100644
--- a/src/main/java/org/gnunet/statistics/StatisticsWatcher.java
+++ b/src/main/java/org/gnunet/statistics/StatisticsWatcher.java
@@ -2,5 +2,4 @@ package org.gnunet.statistics;
 
 public interface StatisticsWatcher {
     public void onReceive(String subsystem, String name, long value);
-    public void onTimeout();
 }
diff --git a/src/main/java/org/gnunet/statistics/WatchRequest.java b/src/main/java/org/gnunet/statistics/WatchRequest.java
index 49e1615..784aa5e 100644
--- a/src/main/java/org/gnunet/statistics/WatchRequest.java
+++ b/src/main/java/org/gnunet/statistics/WatchRequest.java
@@ -1,15 +1,14 @@
 package org.gnunet.statistics;
 
 import org.gnunet.mq.Envelope;
-import org.gnunet.mq.MessageQueue;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
+import org.gnunet.statistics.messages.WatchMessage;
 
-/**
- */
-public class WatchRequest extends RequestContainer.Request {
-    public String subsystem;
-    public String name;
-    public StatisticsWatcher watcher;
+
+class WatchRequest extends Request {
+    public final String subsystem;
+    public final String name;
+    public final StatisticsWatcher watcher;
 
     public WatchRequest(String subsystem, String name, StatisticsWatcher watcher) {
         this.subsystem = subsystem;
@@ -25,7 +24,9 @@ public class WatchRequest extends RequestContainer.Request {
         return new Envelope(m);
     }
 
+    @Override
     public void cancel() {
-
+        // do nothing, incoming changes with the watch id of this request
+        // will simply be ignured
     }
 }
diff --git a/src/main/java/org/gnunet/statistics/package-info.java b/src/main/java/org/gnunet/statistics/package-info.java
index fce59e7..6d3cb6f 100644
--- a/src/main/java/org/gnunet/statistics/package-info.java
+++ b/src/main/java/org/gnunet/statistics/package-info.java
@@ -19,6 +19,6 @@
  */
 
 /**
- * API for the gnunet statistics service.
+ * API for the GNUnet statistics service.
  */
 package org.gnunet.statistics;
diff --git a/src/main/java/org/gnunet/testbed/Controller.java b/src/main/java/org/gnunet/testbed/Controller.java
index 1e78e2a..da3143b 100644
--- a/src/main/java/org/gnunet/testbed/Controller.java
+++ b/src/main/java/org/gnunet/testbed/Controller.java
@@ -21,7 +21,8 @@ package org.gnunet.testbed;
 
 import org.gnunet.mq.Envelope;
 import org.gnunet.requests.MatchingRequestContainer;
-import org.gnunet.requests.RequestContainer;
+import org.gnunet.requests.Request;
+import org.gnunet.requests.RequestIdentifier;
 import org.gnunet.testbed.callbacks.*;
 import org.gnunet.testbed.messages.*;
 import org.gnunet.util.*;
@@ -82,7 +83,7 @@ public class Controller {
      */
     private MatchingRequestContainer<Long,OperationRequest> requests;
 
-    abstract class OperationRequest extends RequestContainer.Request {
+    abstract class OperationRequest extends Request {
         protected final long operationId;
         public OperationRequest() {
             operationId = (((long) host.id) << 32) | (long) operationCounter++;
@@ -121,7 +122,7 @@ public class Controller {
             m.peerId = peerId;
             m.compressedConfig = ccfg.compressedData;
             m.configSize = ccfg.getUncompressedSize();
-            System.out.println("create request with opid " + m.operationId);
+            System.out.println("create getRequestIdentifier with opid " + m.operationId);
             return new Envelope(m);
         }
     }
@@ -139,7 +140,7 @@ public class Controller {
             m.operationId = operationId;
             m.peerId = peerId;
 
-            System.out.println("destroy request with opid " + m.operationId);
+            System.out.println("destroy getRequestIdentifier with opid " + m.operationId);
             return new Envelope(m);
         }
     }
@@ -263,9 +264,10 @@ public class Controller {
 
     public class ControllerMessageReceiver extends RunaboutMessageReceiver {
         public void visit(PeerEventMessage m) {
-            RequestContainer.Request r = requests.getRequest(m.operationId);
+            RequestIdentifier<OperationRequest> rId = requests.getRequestIdentifier(m.operationId);
+            OperationRequest r = rId.getRequest();
             if (null == r) {
-                logger.error("no matching peer event request for op id %s", m.operationId);
+                logger.error("no matching peer event getRequestIdentifier for op id %s", m.operationId);
                 return;
             }
             if (r instanceof PeerStartRequest && m.eventType == EventTypes.PEER_START) {
@@ -275,14 +277,15 @@ public class Controller {
                 PeerStopRequest psr = (PeerStopRequest) r;
                 psr.peerChurnCallback.onChurnSuccess();
             } else {
-                logger.error("unexpected peer event message, event type %s and request %s",
+                logger.error("unexpected peer event message, event type %s and getRequestIdentifier %s",
                              m.eventType, r);
             }
         }
         public void visit(PeerCreateSuccessMessage m) {
-            RequestContainer.Request r = requests.getRequest(m.operationId);
+            RequestIdentifier<OperationRequest> rId = requests.getRequestIdentifier(m.operationId);
+            OperationRequest r = rId.getRequest();
             if (!(r instanceof PeerCreateRequest)) {
-                logger.warn("response to peer create request does not match");
+                logger.warn("response to peer create getRequestIdentifier does not match");
                 return;
             }
             PeerCreateRequest pcr = (PeerCreateRequest) r;
@@ -290,13 +293,14 @@ public class Controller {
             pcr.cb.onPeerCreated(p);
         }
         public void visit(PeerInformationMessage m) {
-            RequestContainer.Request r = requests.getRequest(m.operationId);
+            RequestIdentifier<OperationRequest> rId = requests.getRequestIdentifier(m.operationId);
+            OperationRequest r = rId.getRequest();
             if (null == r) {
                 logger.error("unexpected peer information message (opid={})", m.operationId);
                 return;
             }
             if (!(r instanceof PeerInformationRequest)) {
-                logger.warn("response to peer create request does not match");
+                logger.warn("response to peer create getRequestIdentifier does not match");
                 return;
             }
             PeerInformationRequest pir = (PeerInformationRequest) r;
@@ -304,14 +308,15 @@ public class Controller {
             pir.cb.onSuccess(m.peerIdentity, ccfg.decompress());
         }
         public void visit(GenericOperationSuccessMessage m) {
-            OperationRequest r = requests.getRequest(m.operationId);
+            RequestIdentifier<OperationRequest> rId = requests.getRequestIdentifier(m.operationId);
+            OperationRequest r = rId.getRequest();
             if (null == r) {
                 logger.error("unexpected generic success message (opid={})", m.operationId);
                 return;
             }
             if (!(r instanceof GenericOperationRequest)) {
                 logger.error(String.format(
-                               "got GenericOperationSuccessMessage as response to request '%s', opid %s; event type %s",
+                               "got GenericOperationSuccessMessage as response to getRequestIdentifier '%s', opid %s; event type %s",
                                r.getClass(), m.operationId, m.eventType));
                 return;
             }
@@ -319,7 +324,8 @@ public class Controller {
             gr.onSuccess();
         }
         public void visit(ConnectionEventMessage m) {
-            OperationRequest r = requests.getRequest(m.operationId);
+            RequestIdentifier<OperationRequest> rId = requests.getRequestIdentifier(m.operationId);
+            OperationRequest r = rId.getRequest();
             if (null == r) {
                 logger.error("unexpected connection event message (opid={})", m.operationId);
                 return;
@@ -408,7 +414,7 @@ public class Controller {
     /**
      * Create a link from slave controller to delegated controller. Whenever the
      * master controller is asked to start a peer at the delegated controller the
-     * request will be routed towards slave controller (if a route exists). The
+     * getRequestIdentifier will be routed towards slave controller (if a route exists). The
      * slave controller will then route it to the delegated controller. The
      * configuration of the delegated controller is given and is used to either
      * create the delegated controller or to connect to an existing controller. Note
@@ -445,7 +451,7 @@ public class Controller {
      * @param cc the completion callback to call to inform the status of
      *          registration. After calling this callback the registration handle
      *          will be invalid. Cannot be NULL
-     * @return handle to the host registration which can be used to cancel the
+     * @return handle to the host registration which can be used to onCancel the
      *           registration; NULL if another registration handle is present and
      *           is not cancelled
      */
@@ -475,7 +481,7 @@ public class Controller {
          * Start this peer
          *
          * @param peerChurnCallback completion callback
-         * @return handle to cancel the operation
+         * @return handle to onCancel the operation
          */
         public Cancelable start(PeerChurnCallback peerChurnCallback) {
             PeerStartRequest r = new PeerStartRequest(this, peerChurnCallback);
@@ -486,7 +492,7 @@ public class Controller {
          * Stop this peer
          *
          * @param peerChurnCallback completion callback
-         * @return handle to cancel the operation
+         * @return handle to onCancel the operation
          */
         public Cancelable stop(PeerChurnCallback peerChurnCallback) {
             PeerStopRequest r = new PeerStopRequest(this, peerChurnCallback);
@@ -530,7 +536,7 @@ public class Controller {
          *
          * @param otherPeer peer to connect this peer to
          * @param cb callback object to signal completion or failure
-         * @return token to cancel the request
+         * @return token to onCancel the getRequestIdentifier
          *
          */
         public Cancelable connectOverlay(Peer otherPeer, OperationCompletionCallback cb) {
@@ -541,7 +547,7 @@ public class Controller {
 
         /**
          * Connect to a service offered by the given peer.  Will ensure that
-         * the request is queued to not overwhelm our ability to create and
+         * the getRequestIdentifier is queued to not overwhelm our ability to create and
          * maintain connections with other systems.  The actual service
          * handle is then returned via the 'op_result' member in the event
          * callback.  The 'ca' callback is used to create the connection
diff --git a/src/main/java/org/gnunet/testing/TestingServer.java b/src/main/java/org/gnunet/testing/TestingServer.java
index 97b6bc0..8cda836 100644
--- a/src/main/java/org/gnunet/testing/TestingServer.java
+++ b/src/main/java/org/gnunet/testing/TestingServer.java
@@ -5,7 +5,6 @@ import org.gnunet.util.RelativeTime;
 import org.gnunet.util.Server;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.channels.ServerSocketChannel;
diff --git a/src/main/java/org/gnunet/testing/TestingSetup.java b/src/main/java/org/gnunet/testing/TestingSetup.java
index 6f8d578..276480b 100644
--- a/src/main/java/org/gnunet/testing/TestingSetup.java
+++ b/src/main/java/org/gnunet/testing/TestingSetup.java
@@ -21,7 +21,6 @@
 package org.gnunet.testing;
 
 import org.gnunet.util.Program;
-import org.gnunet.util.RelativeTime;
 
 /**
  * A testing setup is responsible for configuring the loggers during testing, and can
diff --git a/src/main/java/org/gnunet/transport/Transport.java b/src/main/java/org/gnunet/transport/Transport.java
index 6a3da02..eba3678 100644
--- a/src/main/java/org/gnunet/transport/Transport.java
+++ b/src/main/java/org/gnunet/transport/Transport.java
@@ -5,7 +5,6 @@ import org.gnunet.mq.Envelope;
 import org.gnunet.mq.NotifySentHandler;
 import org.gnunet.transport.callbacks.HelloUpdateCallback;
 import org.gnunet.transport.callbacks.OfferHelloContinuation;
-import org.gnunet.transport.callbacks.PeerIterateCallback;
 import org.gnunet.transport.callbacks.TryConnectCallback;
 import org.gnunet.transport.messages.RequestConnectMessage;
 import org.gnunet.transport.messages.StartMessage;
@@ -40,7 +39,7 @@ public class Transport {
     private List<GetHelloHolder> getHelloHolderList = new LinkedList<GetHelloHolder>();
 
     /**
-     * Wrapper to give each get hello request a unique identity.
+     * Wrapper to give each get hello getRequestIdentifier a unique identity.
      */
     private class GetHelloHolder {
         HelloUpdateCallback cb;
@@ -89,9 +88,9 @@ public class Transport {
      * the given peer.
      *
      * @param target who we should try to connect to
-     * @param cb     callback to be called when request was transmitted to transport
+     * @param cb     callback to be called when getRequestIdentifier was transmitted to transport
      *               service
-     * @return a handle to cancel the operation
+     * @return a handle to onCancel the operation
      */
     Cancelable tryConnect(PeerIdentity target, final TryConnectCallback cb) {
         RequestConnectMessage m = new RequestConnectMessage();
@@ -119,7 +118,7 @@ public class Transport {
      * Obtain the HELLO message for this peer.
      *
      * @param rec function to call with the HELLO
-     * @return handle to cancel the operation
+     * @return handle to onCancel the operation
      */
     Cancelable getHello(final HelloUpdateCallback rec) {
         if (myHello != null) {
diff --git a/src/main/java/org/gnunet/transport/callbacks/PeerAddressListCallback.java b/src/main/java/org/gnunet/transport/callbacks/PeerAddressListCallback.java
index 4e3d5ac..12b6d97 100644
--- a/src/main/java/org/gnunet/transport/callbacks/PeerAddressListCallback.java
+++ b/src/main/java/org/gnunet/transport/callbacks/PeerAddressListCallback.java
@@ -42,7 +42,6 @@ package org.gnunet.transport.callbacks;
 
 
 import org.gnunet.transport.HelloAddress;
-import org.gnunet.util.PeerIdentity;
 
 public interface PeerAddressListCallback {
     void onPeerAddress(HelloAddress helloAddress);
diff --git a/src/main/java/org/gnunet/transport/messages/AddressIterateMessage.java b/src/main/java/org/gnunet/transport/messages/AddressIterateMessage.java
index 85460e3..c3be994 100644
--- a/src/main/java/org/gnunet/transport/messages/AddressIterateMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/AddressIterateMessage.java
@@ -4,7 +4,6 @@ package org.gnunet.transport.messages;
 import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
-import org.gnunet.util.AbsoluteTime;
 import org.gnunet.util.AbsoluteTimeMessage;
 import org.gnunet.util.GnunetMessage;
 import org.gnunet.util.PeerIdentity;
diff --git a/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java b/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java
index 69f9fd4..dfa4b97 100644
--- a/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java
+++ b/src/main/java/org/gnunet/transport/messages/AddressIterateResponseMessage.java
@@ -20,12 +20,9 @@
 
 package org.gnunet.transport.messages;
 
-import org.gnunet.construct.IntegerFill;
 import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.PeerIdentity;
 
 @UnionCase(383)
 public class AddressIterateResponseMessage implements GnunetMessage.Body {
diff --git a/src/main/java/org/gnunet/util/AbsoluteTime.java b/src/main/java/org/gnunet/util/AbsoluteTime.java
index 07dd816..b6ab811 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTime.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTime.java
@@ -278,7 +278,7 @@ public class AbsoluteTime implements Comparable<AbsoluteTime> {
     }
 
     public String toFancyString() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sdf.format(new Date(getMilliseconds()));
     }
 
diff --git a/src/main/java/org/gnunet/util/Client.java b/src/main/java/org/gnunet/util/Client.java
index 02e59aa..5ca60ce 100644
--- a/src/main/java/org/gnunet/util/Client.java
+++ b/src/main/java/org/gnunet/util/Client.java
@@ -77,7 +77,7 @@ public class Client extends MessageQueue {
     private boolean notifyTransmitReadyDelayed;
 
     /**
-     * When notifyTransmitReadyDelayed is true, This can be used to cancel the task
+     * When notifyTransmitReadyDelayed is true, This can be used to onCancel the task
      * waiting for the connection to be established.
      */
     private Cancelable delayedNotifyTransmitHandle;
@@ -91,7 +91,7 @@ public class Client extends MessageQueue {
     private boolean receiverActive;
 
     /**
-     * Handle to cancel the message currently submitted in the queue,
+     * Handle to onCancel the message currently submitted in the queue,
      */
     private Cancelable currentSubmit;
     private Scheduler.TaskIdentifier receiverLifenessTask;
@@ -163,9 +163,9 @@ public class Client extends MessageQueue {
      *                    for example because the protocol is stateless
      * @param size        size of the message we want to transmit, can be an upper bound
      * @param transmitter the MessageTransmitter object to call once the client is ready to transmit or
-     *                    when the timeout is over. Guaranteed to be called *after* notifyTransmitReady has returned.  @return a handle that can be used to cancel the transmit request
+     *                    when the timeout is over. Guaranteed to be called *after* notifyTransmitReady has returned.  @return a handle that can be used to onCancel the transmit getRequestIdentifier
      *
-     * @return a handle to cancel the notification
+     * @return a handle to onCancel the notification
      */
     public Cancelable notifyTransmitReady(final RelativeTime timeout,
                                           final boolean autoRetry, int size, final MessageTransmitter transmitter) {
@@ -230,7 +230,7 @@ public class Client extends MessageQueue {
      * @param timeout when should we give up sending the message, and call cont.cont(false)
      * @param message the message to send
      * @param cont called when the message has been sent successfully or on error
-     * @return a handle to cancel sending the message
+     * @return a handle to onCancel sending the message
      */
     public Cancelable transmitWhenReady(final RelativeTime timeout, final GnunetMessage.Body message, final Continuation cont) {
         return notifyTransmitReady(timeout, false, 0, new MessageTransmitter() {
@@ -256,7 +256,7 @@ public class Client extends MessageQueue {
      *
      * @param message the message to send
      * @param cont called when the message has been sent successfully or on error
-     * @return a handle to cancel sending the message
+     * @return a handle to onCancel sending the message
      */
     public Cancelable transmitWhenReady(final GnunetMessage.Body message, final Continuation cont) {
         return transmitWhenReady(RelativeTime.FOREVER, message, cont);
@@ -270,12 +270,9 @@ public class Client extends MessageQueue {
     }
 
     /**
-     * Disconnect from the service. Cancel all pending receive/transmit requests.
+     * Disconnect from the service. Cancels all pending receive/transmit requests.
      */
     public void disconnect() {
-        if (notifyTransmitReadyDelayed) {
-            logger.error("disconnecting while notifyTransmitReady is pending");
-        }
         connection.disconnect();
         connection = null;
         if (receiverLifenessTask != null) {
diff --git a/src/main/java/org/gnunet/util/Connection.java b/src/main/java/org/gnunet/util/Connection.java
index 9e136a8..cce32a4 100644
--- a/src/main/java/org/gnunet/util/Connection.java
+++ b/src/main/java/org/gnunet/util/Connection.java
@@ -141,12 +141,12 @@ public class Connection {
     }
 
     /**
-     * Represents a request for transmission.
+     * Represents a getRequestIdentifier for transmission.
      */
     public interface TransmitHandle extends Cancelable {
         /**
-         * Cancel a request for the transmit ready notification.
-         * This does *not* cancel a transmission that already has been started.
+         * Cancel a getRequestIdentifier for the transmit ready notification.
+         * This does *not* onCancel a transmission that already has been started.
          */
         public void cancel();
     }
@@ -298,7 +298,7 @@ public class Connection {
             }
             // timeout is forever, because there is no way to directly limit the transmission time
             // of a message, only the max. wait time before transmission.
-            // cancel must be called on the transmitTask if we disconnect
+            // onCancel must be called on the transmitTask if we disconnect
             Scheduler.TaskConfiguration tc = new Scheduler.TaskConfiguration(RelativeTime.FOREVER, this);
             tc.addSelectEvent(connectionChannel, SelectionKey.OP_WRITE);
             this.transmitTask = tc.schedule();
@@ -549,7 +549,7 @@ public class Connection {
      * @param timeout     after how long should we give up (and call transmitter.transmit(null))
      * @param transmitter the MessageTransmitter object to call once the client is ready to transmit or
      *                    when the timeout is over. Guaranteed to be called *after* notifyTransmitReady has returned.
-     * @return a handle that can be used to cancel the transmit request, null if request could be satisfied immediately
+     * @return a handle that can be used to onCancel the transmit getRequestIdentifier, null if getRequestIdentifier could be satisfied immediately
      */
     public TransmitHandle notifyTransmitReady(int size, RelativeTime timeout, final MessageTransmitter transmitter) {
         if (disconnected) {
@@ -557,7 +557,7 @@ public class Connection {
         }
         if (nextTransmitHelper != null) {
             throw new AssertionError(
-                    "previous transmit request must have completed before calling notifyTransmitReady again");
+                    "previous transmit getRequestIdentifier must have completed before calling notifyTransmitReady again");
         }
 
         if (timeout.getMicroseconds() <= 0) {
@@ -593,7 +593,7 @@ public class Connection {
      * @param cont    continuation to call
      * @return
      */
-    /* package-protected */ Cancelable notifyConnected(RelativeTime timeout, final Continuation cont) {
+    Cancelable notifyConnected(RelativeTime timeout, final Continuation cont) {
         if (notifyConnectedTimeout != null) {
             throw new AssertionError();
         }
@@ -621,6 +621,10 @@ public class Connection {
             logger.error("disconnect called twice");
         }
         disconnected = true;
+        if (notifyConnectedTimeout != null) {
+            notifyConnectedTimeout.cancel();
+            notifyConnectedTimeout = null;
+        }
         if (receiveTaskId != null) {
             receiveTaskId.cancel();
             receiveTaskId = null;
diff --git a/src/main/java/org/gnunet/util/Helper.java b/src/main/java/org/gnunet/util/Helper.java
index 8256ab9..1462cf2 100644
--- a/src/main/java/org/gnunet/util/Helper.java
+++ b/src/main/java/org/gnunet/util/Helper.java
@@ -26,7 +26,6 @@ import org.gnunet.mq.MessageQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOError;
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
index a2da4c9..9beb632 100644
--- a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
+++ b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
@@ -26,12 +26,8 @@ import org.gnunet.construct.ProtocolViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOError;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.channels.Channel;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.Pipe;
 import java.nio.channels.ReadableByteChannel;
 
 /**
diff --git a/src/main/java/org/gnunet/util/MessageTransmitter.java b/src/main/java/org/gnunet/util/MessageTransmitter.java
index 54a6555..2b63c8c 100644
--- a/src/main/java/org/gnunet/util/MessageTransmitter.java
+++ b/src/main/java/org/gnunet/util/MessageTransmitter.java
@@ -35,9 +35,9 @@ public interface MessageTransmitter {
 
 
     /**
-     * Called when the transmit request could not be fullfilled.
+     * Called when the transmit getRequestIdentifier could not be fullfilled.
      *
-     * After transmit has been called, handleError will not be called anymore (until the next transmit request)
+     * After transmit has been called, handleError will not be called anymore (until the next transmit getRequestIdentifier)
      */
     void handleError();
 }
diff --git a/src/main/java/org/gnunet/util/Program.java b/src/main/java/org/gnunet/util/Program.java
index faacbe1..31b4924 100644
--- a/src/main/java/org/gnunet/util/Program.java
+++ b/src/main/java/org/gnunet/util/Program.java
@@ -73,30 +73,18 @@ public abstract class Program {
             action = ArgumentAction.STORE_STRING)
     public String logFile;
 
-
+    /**
+     * Positional arguments, excluding those that have been processed
+     * by the command line parser.
+     */
     protected String[] unprocessedArgs;
 
-    private final String[] args;
-
-    private int returnValue = 0;
-
-
     /**
-     * A program with the desired environment for a GNUnet utility.
-     * While executing, the scheduler is guaranteed to run, command arguments are parsed,
-     * the default configuration is loaded and the DNS Resolver is initialized.
-     *
-     * @param args array of command line arguments to parse. used to automatically load additional settings
-     *             and configure log levels.
+     * Return value for the program.
+     * We prefer setting the return value, as System.exit(...) does bad things sometimes.
+     * (In JUnit test cases, for instance)
      */
-    public Program(String... args) {
-        this.args = args;
-
-        /*
-         * Remember: We can't parse command line arguments here, as java's initialization order
-         * dictates that member variables of subclasses are initialized *after* the superclass constructor (here).
-         */
-    }
+    private int returnValue = 0;
 
     /**
      * Configure logging with the given log level and log file.
@@ -202,7 +190,7 @@ public abstract class Program {
      *                      is invoked inside a scheduler task or not
      * @return the exit value of the program
      */
-    public final int start(boolean withScheduler) {
+    public final int start(boolean withScheduler, String... args) {
         Parser optParser = new Parser(this);
         unprocessedArgs = optParser.parse(args);
 
@@ -246,8 +234,8 @@ public abstract class Program {
      *
      * @return the exit value of the program
      */
-    public final int start() {
-        return start(true);
+    public final int start(String... args) {
+        return start(true, args);
     }
 
 
@@ -256,7 +244,7 @@ public abstract class Program {
      *
      * @return the exit value of the program
      */
-    public final int startWithoutScheduler() {
-        return start(false);
+    public final int startWithoutScheduler(String... args) {
+        return start(false, args);
     }
 }
diff --git a/src/main/java/org/gnunet/util/RelativeTime.java b/src/main/java/org/gnunet/util/RelativeTime.java
index fec8f80..188d9ac 100644
--- a/src/main/java/org/gnunet/util/RelativeTime.java
+++ b/src/main/java/org/gnunet/util/RelativeTime.java
@@ -236,4 +236,9 @@ public final class RelativeTime implements Comparable<RelativeTime> {
     public long getSeconds() {
         return rel_value_us / (1000 * 1000);
     }
+
+    public static RelativeTime fromSeconds(long i) {
+        RelativeTime relativeTime = new RelativeTime(i * 1000 * 1000);
+        return relativeTime;
+    }
 }
diff --git a/src/main/java/org/gnunet/util/Resolver.java b/src/main/java/org/gnunet/util/Resolver.java
index 3ddcfa4..f6c2e00 100644
--- a/src/main/java/org/gnunet/util/Resolver.java
+++ b/src/main/java/org/gnunet/util/Resolver.java
@@ -22,7 +22,6 @@ package org.gnunet.util;
 
 import com.google.common.net.InetAddresses;
 import org.gnunet.construct.*;
-import org.gnunet.construct.ProtocolViolationException;
 import org.gnunet.util.getopt.Argument;
 import org.gnunet.util.getopt.ArgumentAction;
 import org.slf4j.Logger;
@@ -196,7 +195,7 @@ public class Resolver {
      * @param hostname hostname to resolve
      * @param timeout  timeout, calls cb.onTimeout on expiratoin
      * @param cb       callback
-     * @return a handle to cancel the request, null if request could be satisfied immediately
+     * @return a handle to onCancel the getRequestIdentifier, null if getRequestIdentifier could be satisfied immediately
      */
     public Cancelable resolveHostname(String hostname, RelativeTime timeout, final AddressCallback cb) {
         // try if hostname is numeric IP or loopback
@@ -352,7 +351,7 @@ public class Resolver {
 
 
     public static void main(final String[] argv) {
-        new Program(argv) {
+        new Program() {
             @Argument(shortname = "r", longname = "reverse",
                     description = "do reverse dns lookup",
                     action = ArgumentAction.SET)
@@ -411,6 +410,6 @@ public class Resolver {
             protected String makeHelpText() {
                 return "tool for forward and reverse DNS lookup";
             }
-        }.start();
+        }.start(argv);
     }
 }
diff --git a/src/main/java/org/gnunet/util/Scheduler.java b/src/main/java/org/gnunet/util/Scheduler.java
index 10b4bcf..ef801dd 100644
--- a/src/main/java/org/gnunet/util/Scheduler.java
+++ b/src/main/java/org/gnunet/util/Scheduler.java
@@ -214,7 +214,7 @@ public class Scheduler {
                 }
             }
             for (TaskIdentifier tt : executableTasks) {
-                // cancel subscriptions to other events, we can execute now!
+                // onCancel subscriptions to other events, we can execute now!
                 tt.deregister();
                 queueReady(tt);
             }
@@ -548,7 +548,7 @@ public class Scheduler {
         @Override
         public void cancel() {
             if (hasRun) {
-                throw new AssertionError("can't cancel task that already ran");
+                throw new AssertionError("can't onCancel task that already ran");
             }
             if (isCanceled) {
                 throw new AssertionError("task canceled twice");
@@ -557,7 +557,7 @@ public class Scheduler {
             scheduler.pending.remove(this);
         }
 
-        public void deregister() {
+        private void deregister() {
             if (subscriptions != null) {
                 subscriptions.stop(this);
             }
@@ -578,7 +578,7 @@ public class Scheduler {
         private SchedulerInstance scheduler;
 
         /**
-         * Create a TaskIdentifier.
+         * Create a TaskConfiguration.
          *
          * @param delay when will the task be run?
          *              may be null to indicate that this task may not be run
@@ -593,7 +593,7 @@ public class Scheduler {
             this.deadline = delay.toAbsolute();
         }
 
-        TaskConfiguration(RelativeTime delay, Task task) {
+        public TaskConfiguration(RelativeTime delay, Task task) {
             this(threadScheduler.get(), delay, task);
         }
 
@@ -624,6 +624,10 @@ public class Scheduler {
                 subscriptions = new Subscriptions(scheduler.selector);
             subscriptions.add(channel, event);
         }
+
+        public void setLifeness(boolean b) {
+            this.lifeness = b;
+        }
     }
 
     /**
@@ -651,7 +655,7 @@ public class Scheduler {
      *
      * @param delay time to wait until running the task
      * @param task  the task to run after delay
-     * @return the TaskIdentifier, can be used to cancel the task until it has been executed.
+     * @return the TaskIdentifier, can be used to onCancel the task until it has been executed.
      */
     public static TaskIdentifier addDelayed(RelativeTime delay, Task task) {
         TaskConfiguration tid = new TaskConfiguration(delay, task);
@@ -817,4 +821,11 @@ public class Scheduler {
         fpt.start();
         return new FilePipe(fpt);
     }
+
+    public static void debugPrintPendingTasks() {
+        System.err.println("pending tasks:");
+        for (TaskIdentifier i : threadScheduler.get().pending) {
+            System.err.println(i.task.getClass());
+        }
+    }
 }
diff --git a/src/main/java/org/gnunet/util/Server.java b/src/main/java/org/gnunet/util/Server.java
index 4d783a1..ccf977e 100644
--- a/src/main/java/org/gnunet/util/Server.java
+++ b/src/main/java/org/gnunet/util/Server.java
@@ -20,7 +20,6 @@
 
 package org.gnunet.util;
 
-import org.gnunet.construct.Construct;
 import org.grothoff.Runabout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -160,7 +159,7 @@ public class Server {
          * @param timeout     after how long should we give up (and call
          *                    notify with buf NULL and size 0)?
          * @param transmitter callback
-         * @return a handle to cancel the notification
+         * @return a handle to onCancel the notification
          */
         public Cancelable notifyTransmitReady(int size, RelativeTime timeout, MessageTransmitter transmitter) {
             return connection.notifyTransmitReady(size, timeout, transmitter);
@@ -172,7 +171,7 @@ public class Server {
          * @param timeout when should we give up sending the message, and call cont.cont(false)
          * @param message the message to send
          * @param cont called when the message has been sent successfully or on error
-         * @return a handle to cancel sending the message
+         * @return a handle to onCancel sending the message
          */
         public Cancelable transmitWhenReady(final RelativeTime timeout, final GnunetMessage.Body message, final Continuation cont) {
             return notifyTransmitReady(0, timeout, new MessageTransmitter() {
@@ -195,7 +194,7 @@ public class Server {
 
         /**
          * Resume receiving from this client, we are done processing the
-         * current request. This function must be called from within each
+         * current getRequestIdentifier. This function must be called from within each
          * message handler (or its respective continuations).
          * <p/>
          * The server does not automatically continue to receive messages to
diff --git a/src/main/java/org/gnunet/util/Service.java b/src/main/java/org/gnunet/util/Service.java
index a150089..af7529e 100644
--- a/src/main/java/org/gnunet/util/Service.java
+++ b/src/main/java/org/gnunet/util/Service.java
@@ -24,7 +24,8 @@ package org.gnunet.util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -56,7 +57,6 @@ public abstract class Service extends Program {
     private Pipe.SourceChannel sigpipeChannel;
 
     public Service(String serviceName, RelativeTime idleTimeout, boolean requireFound, String[] args) {
-        super(args);
         this.serviceName = serviceName;
         this.idleTimeout = idleTimeout;
         this.requireFound = requireFound;
diff --git a/src/main/java/org/gnunet/util/crypto/Ed25519.java b/src/main/java/org/gnunet/util/crypto/Ed25519.java
index 673d86d..e335c99 100644
--- a/src/main/java/org/gnunet/util/crypto/Ed25519.java
+++ b/src/main/java/org/gnunet/util/crypto/Ed25519.java
@@ -24,7 +24,6 @@ package org.gnunet.util.crypto;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
 
 /**
  * Java-only implementation of arithmetic on DJBs Ed25519.
diff --git a/src/main/java/org/gnunet/util/getopt/Parser.java b/src/main/java/org/gnunet/util/getopt/Parser.java
index 135e6f8..cd1603a 100644
--- a/src/main/java/org/gnunet/util/getopt/Parser.java
+++ b/src/main/java/org/gnunet/util/getopt/Parser.java
@@ -21,6 +21,7 @@
 package org.gnunet.util.getopt;
 
 import org.gnunet.construct.ReflectUtil;
+
 import java.lang.reflect.Field;
 import java.util.*;
 
diff --git a/src/main/java/org/gnunet/voting/Ballot.java b/src/main/java/org/gnunet/voting/Ballot.java
index 10bf25a..92ec7da 100644
--- a/src/main/java/org/gnunet/voting/Ballot.java
+++ b/src/main/java/org/gnunet/voting/Ballot.java
@@ -28,8 +28,14 @@ import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Longs;
 import org.gnunet.secretsharing.ThresholdPublicKey;
-import org.gnunet.util.*;
-import org.gnunet.util.crypto.*;
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.Configuration;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.util.crypto.EcdsaPrivateKey;
+import org.gnunet.util.crypto.EcdsaPublicKey;
+import org.gnunet.util.crypto.EcdsaSignature;
+import org.gnunet.util.crypto.EddsaSignature;
 import org.gnunet.voting.messages.KeyQueryResponseMessage;
 
 import java.security.MessageDigest;
@@ -263,13 +269,13 @@ public class Ballot {
             }
             confirmationSigs.put(e.getKey(), sig);
         }
-        encryptedVote = EncryptedVote.parseFromConfiguration(cfg);
         Optional<String> optVoterPub = cfg.getValueString("vote", "VOTER_PUB");
         if (optVoterPub.isPresent()) {
             voterPub = EcdsaPublicKey.fromString(optVoterPub.get());
             if (null == voterPub) {
                 throw new InvalidBallotException("voter public key present but invalid");
             }
+            encryptedVote = EncryptedVote.parseFromConfiguration(cfg, voterPub);
         }
 
         startTime = getTime(cfg, "START");
@@ -302,8 +308,8 @@ public class Ballot {
             m.signedGuidKey = new KeyQueryResponseMessage.BallotPublicKey();
             m.signedGuidKey.ballotGuid = getBallotGuid();
             m.signedGuidKey.publicKey = ThresholdPublicKey.fromString(e.getValue());
+            thresholdPublicKeys.put(alias, m);
         }
-
     }
 
     /**
@@ -355,7 +361,7 @@ public class Ballot {
             if (counts.containsKey(pk)) {
                 counts.put(pk, counts.get(pk) + 1);
             } else {
-                counts.put(pk, 0);
+                counts.put(pk, 1);
             }
         }
         int maxCount = 0;
@@ -390,11 +396,9 @@ public class Ballot {
             i++;
         }
         voterPub = voterPrivateKey.getPublicKey();
-        if (choiceId < 0 || choiceId > 1) {
-            throw new InvalidBallotException(String.format("choice '%s' not valid", choice));
-        }
-
-        encryptedVote = EncryptedVote.fromChoice(choiceId, thresholdPublicKey, voterPrivateKey);
+        encryptedVote = EncryptedVote.fromChoice(choiceId, thresholdPublicKey, voterPrivateKey, voterPub);
+        System.out.println("voter encrypted vote, ciphertext: " + encryptedVote.v.toString());
+        System.out.println("threshold key (of voter): " + thresholdPublicKey.toString());
     }
 
     /**
@@ -442,9 +446,7 @@ public class Ballot {
         if (null != groupCert) {
             groupCert.writeBallotConfig(cfg);
         }
-        System.out.println("thresh set when writing: " + thresholdPublicKeys.size());
         for (Map.Entry<String,KeyQueryResponseMessage> e : thresholdPublicKeys.entrySet()) {
-            System.out.println("writing tresh");
             cfg.setValueString("threshold-pubkeys", e.getKey(),
                     e.getValue().signedGuidKey.publicKey.toString());
             cfg.setValueString("threshold-pubkey-sigs", e.getKey(),
@@ -560,6 +562,15 @@ public class Ballot {
         } else {
             buf.append("no voter\n");
         }
+        if (thresholdPublicKeys != null && thresholdPublicKeys.size() != 0) {
+            buf.append("Authorities with threshold public key:\n");
+            for (String s : thresholdPublicKeys.keySet()) {
+                buf.append(s);
+                buf.append("\n");
+            }
+        } else {
+            buf.append("no threshold public keys");
+        }
         return buf.toString();
     }
 
diff --git a/src/main/java/org/gnunet/voting/BallotTool.java b/src/main/java/org/gnunet/voting/BallotTool.java
index c0767a4..d03e0ea 100644
--- a/src/main/java/org/gnunet/voting/BallotTool.java
+++ b/src/main/java/org/gnunet/voting/BallotTool.java
@@ -112,9 +112,9 @@ public class BallotTool extends Program {
 
     @Argument(
             shortname = "k",
-            longname = "request-key",
+            longname = "getRequestIdentifier-key",
             action = ArgumentAction.SET,
-            description = "request the threshold public key from authorities")
+            description = "getRequestIdentifier the threshold public key from authorities")
     boolean requestKey = false;
 
     @Argument(
@@ -348,7 +348,8 @@ public class BallotTool extends Program {
             }
             ThresholdPublicKey thresholdPublicKey = ballot.getMajorityThresholdPublicKey();
             if (null == thresholdPublicKey) {
-                System.err.println("no threshold public key in ballot");
+                System.err.println(String.format("no majority threshold public key in ballot (got keys of %s authorities)",
+                        (ballot.thresholdPublicKeys == null) ? 0 : ballot.thresholdPublicKeys.size()));
                 setReturnValue(1);
                 return;
             }
@@ -364,7 +365,7 @@ public class BallotTool extends Program {
             }
             Random r = new Random();
             PeerIdentity authority = remainingAuthorities.get(r.nextInt(remainingAuthorities.size()));
-            System.out.println("submitting to authority" + authority.toString());
+            System.out.println("submitting to authority " + authority.toString());
             currentAuthority = authority;
             mesh = new Mesh(cfg, new BallotTunnelEndHandler(), new SubmitReceiver());
             tunnel = mesh.createTunnel(authority, TallyAuthorityDaemon.MESH_PORT, true, true, null);
@@ -471,14 +472,9 @@ public class BallotTool extends Program {
             doCommands();
         }
     }
-
-    private BallotTool(String[] args) {
-        super(args);
-    }
-
     public static void main(String args[]) {
-        Program tool = new BallotTool(args);
-        int ret = tool.start();
+        Program tool = new BallotTool();
+        int ret = tool.start(args);
         System.exit(ret);
     }
 }
diff --git a/src/main/java/org/gnunet/voting/CertifyGroupTool.java b/src/main/java/org/gnunet/voting/CertifyGroupTool.java
index ec82eba..37dcd05 100644
--- a/src/main/java/org/gnunet/voting/CertifyGroupTool.java
+++ b/src/main/java/org/gnunet/voting/CertifyGroupTool.java
@@ -74,13 +74,9 @@ public class CertifyGroupTool extends Program {
                "The resulting certificate file written to standard output.";
     }
 
-    private CertifyGroupTool(String... args) {
-        super(args);
-    }
-
     public static void main(String args[]) {
-        CertifyGroupTool tool = new CertifyGroupTool(args);
-        int ret = tool.start();
+        CertifyGroupTool tool = new CertifyGroupTool();
+        int ret = tool.start(args);
         System.exit(ret);
     }
 
diff --git a/src/main/java/org/gnunet/voting/EncryptedVote.java b/src/main/java/org/gnunet/voting/EncryptedVote.java
index bf13a66..6fa0d1f 100644
--- a/src/main/java/org/gnunet/voting/EncryptedVote.java
+++ b/src/main/java/org/gnunet/voting/EncryptedVote.java
@@ -28,37 +28,80 @@ import org.gnunet.secretsharing.Ciphertext;
 import org.gnunet.secretsharing.Plaintext;
 import org.gnunet.secretsharing.ThresholdPublicKey;
 import org.gnunet.util.Configuration;
-import org.gnunet.util.Strings;
 import org.gnunet.util.crypto.EcdsaPrivateKey;
+import org.gnunet.util.crypto.EcdsaPublicKey;
+import org.gnunet.voting.simulation.Voter;
+import org.omg.CORBA.DynAnyPackage.Invalid;
 
 import java.math.BigInteger;
 
 public class EncryptedVote implements Message {
-    // TODO: zero knowledge proof
-    // TODO: signature
+    @NestedMessage
+    public Ciphertext v;
+
 
     @NestedMessage
-    Ciphertext v;
+    public EcdsaPublicKey voterPublicKey;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        EncryptedVote that = (EncryptedVote) o;
+
+        if (v != null ? !v.equals(that.v) : that.v != null) return false;
+        if (voterPublicKey != null ? !voterPublicKey.equals(that.voterPublicKey) : that.voterPublicKey != null)
+            return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = v != null ? v.hashCode() : 0;
+        result = 31 * result + (voterPublicKey != null ? voterPublicKey.hashCode() : 0);
+        return result;
+    }
+
 
-    public static EncryptedVote parseFromConfiguration(Configuration cfg) {
+    /**
+     * Construct an EncryptedVote by parsing it from the configuration.
+     * The voter public key must be passed separately.
+     *
+     * @param cfg configuration
+     * @param voterPublicKey public key of the voter
+     * @return the encrypted vote
+     */
+    public static EncryptedVote parseFromConfiguration(Configuration cfg, EcdsaPublicKey voterPublicKey) {
         Optional<String> optVal = cfg.getValueString("vote", "ENCRYPTED_VOTE_VAL");
         if (!optVal.isPresent()) {
             return null;
         }
         EncryptedVote encryptedVote = new EncryptedVote();
+        encryptedVote.voterPublicKey = voterPublicKey;
         encryptedVote.v = Ciphertext.fromString(optVal.get());
         return encryptedVote;
     }
-
-    public void writeToConfiguration(Configuration cfg) {
-        cfg.setValueString("vote", "ENCRYPTED_VOTE_VAL", v.toString());    }
+    // TODO: zero knowledge proof
+    // TODO: signature
 
     public static EncryptedVote fromChoice(int choiceId, ThresholdPublicKey thresholdPublicKey,
-                                           EcdsaPrivateKey voterPrivateKey) {
+                                           EcdsaPrivateKey voterPrivateKey, EcdsaPublicKey voterPublicKey) {
+        // for now, we only support one choice!
+        if (choiceId < 0 || choiceId > 1) {
+            throw new InvalidBallotException(String.format("choice '%s' not valid", choiceId));
+        }
+        int choiceExp = (choiceId == 1) ? 1 : -1;
         // FIXME: can we use 'g', or should we use another generator?
-        Plaintext p = Plaintext.generate(BigInteger.valueOf(choiceId));
+        Plaintext p = Plaintext.generate(BigInteger.valueOf(choiceExp));
         EncryptedVote encryptedVote = new EncryptedVote();
         encryptedVote.v = p.encrypt(thresholdPublicKey);
+        encryptedVote.voterPublicKey = voterPublicKey;
         return encryptedVote;
     }
+
+    public void writeToConfiguration(Configuration cfg) {
+        cfg.setValueString("vote", "ENCRYPTED_VOTE_VAL", v.toString());
+    }
 }
diff --git a/src/main/java/org/gnunet/voting/GroupCert.java b/src/main/java/org/gnunet/voting/GroupCert.java
index 296aae7..6899faa 100644
--- a/src/main/java/org/gnunet/voting/GroupCert.java
+++ b/src/main/java/org/gnunet/voting/GroupCert.java
@@ -27,7 +27,6 @@ import org.gnunet.util.Configuration;
 import org.gnunet.util.crypto.EcdsaPrivateKey;
 import org.gnunet.util.crypto.EcdsaPublicKey;
 import org.gnunet.util.crypto.EcdsaSignature;
-import org.gnunet.util.crypto.EddsaSignature;
 
 /**
  * Group certificate.  Attests to the fact that a voter (identified
diff --git a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
index 6fa6b8e..e3a1d8e 100644
--- a/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
+++ b/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
@@ -25,9 +25,6 @@ import org.gnunet.consensus.Consensus;
 import org.gnunet.consensus.ConsensusCallback;
 import org.gnunet.consensus.ConsensusElement;
 import org.gnunet.construct.Construct;
-import org.gnunet.construct.Message;
-import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
 import org.gnunet.mesh.Mesh;
 import org.gnunet.mesh.MeshRunabout;
 import org.gnunet.secretsharing.*;
@@ -35,13 +32,17 @@ import org.gnunet.secretsharing.callbacks.DecryptCallback;
 import org.gnunet.secretsharing.callbacks.SecretReadyCallback;
 import org.gnunet.testbed.CompressedConfig;
 import org.gnunet.util.*;
-import org.gnunet.util.crypto.*;
+import org.gnunet.util.crypto.EcdsaPublicKey;
+import org.gnunet.util.crypto.EddsaPrivateKey;
+import org.gnunet.util.crypto.EddsaPublicKey;
+import org.gnunet.util.crypto.EddsaSignature;
 import org.gnunet.voting.messages.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 
 /**
@@ -114,7 +115,7 @@ public class TallyAuthorityDaemon extends Program {
         /**
          * Product of all encrypted votes (mod q), used to compute the final tally.
          */
-        Ciphertext voteProduct;
+        Ciphertext voteProduct = Ciphertext.identity();
 
         /**
          * Maping from choice to number of votes for that choice.
@@ -142,7 +143,16 @@ public class TallyAuthorityDaemon extends Program {
         public void onElement(ConsensusElement element) {
             System.out.println("got element from consensus");
             EncryptedVote vote = Construct.parseAs(element.data, EncryptedVote.class);
+            System.out.println("got vote from consensus, ciphertext: " + vote.v.toString());
+            if (electionState.countedVoters.contains(vote.voterPublicKey)) {
+                // Complain.  FIXME: keep lexically largest vote, so ballot is unambigous
+                logger.error("voter {} voted twice", vote.voterPublicKey);
+                return;
+            }
             electionState.voteProduct = electionState.voteProduct.multiply(vote.v);
+            electionState.countedVoters.add(vote.voterPublicKey);
+
+            System.out.println("threshold key (of this authority): " + electionState.share.publicKey.toString());
         }
 
         @Override
@@ -286,6 +296,8 @@ public class TallyAuthorityDaemon extends Program {
                 logger.info("concluding in {}", b.closingTime.getRemaining().getSeconds());
                 Scheduler.addDelayed(b.closingTime.getRemaining(), t);
             }
+            System.out.println("authority threshold: " + electionState.ballot.threshold);
+            System.out.println("authority num_peers: " + electionState.ballot.authorities.size());
             // we hash the GUID a second time, so that there's no
             // collision with the consensus (as secretsharing also uses consensus internally)
             electionState.keyGeneration = new KeyGeneration(
@@ -365,15 +377,15 @@ public class TallyAuthorityDaemon extends Program {
         }
     }
 
-    public TallyAuthorityDaemon(String[] args) {
-        super(args);
+    public TallyAuthorityDaemon() {
         authorityPrivateKey = EddsaPrivateKey.createRandom();
         authorityPublicKey = authorityPrivateKey.getPublicKey();
     }
 
     public static void main(String[] args) {
-        TallyAuthorityDaemon daemon = new TallyAuthorityDaemon(args);
-        daemon.start();
+        TallyAuthorityDaemon daemon = new TallyAuthorityDaemon();
+        int ret = daemon.start(args);
+        System.exit(ret);
     }
 
     @Override
diff --git a/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java b/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java
index 96ad4b5..8a1b0e3 100644
--- a/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java
@@ -1,9 +1,9 @@
 package org.gnunet.voting.messages;
 
 
-import org.gnunet.construct.*;
+import org.gnunet.construct.IntegerFill;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.HashCode;
 
 @UnionCase(42006)
 public class ResultQueryResponseMessage implements GnunetMessage.Body {
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
index 342aa0b..4f131e3 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
@@ -1,12 +1,12 @@
 package org.gnunet.voting.messages;
 
 import org.gnunet.construct.NestedMessage;
-import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
-import org.gnunet.util.*;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
 import org.gnunet.util.crypto.EcdsaPublicKey;
 import org.gnunet.util.crypto.EcdsaSignature;
-import org.gnunet.util.crypto.EddsaSignature;
 import org.gnunet.voting.EncryptedVote;
 
 /**
diff --git a/src/main/java/org/gnunet/voting/simulation/CryptoUtil.java b/src/main/java/org/gnunet/voting/simulation/CryptoUtil.java
index 87ecd9f..b8ab04d 100644
--- a/src/main/java/org/gnunet/voting/simulation/CryptoUtil.java
+++ b/src/main/java/org/gnunet/voting/simulation/CryptoUtil.java
@@ -3,7 +3,6 @@ package org.gnunet.voting.simulation;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
 import java.util.Random;
 
 /**
diff --git a/src/main/java/org/gnunet/voting/simulation/VotingParameters.java b/src/main/java/org/gnunet/voting/simulation/VotingParameters.java
index 87bfeac..0086578 100644
--- a/src/main/java/org/gnunet/voting/simulation/VotingParameters.java
+++ b/src/main/java/org/gnunet/voting/simulation/VotingParameters.java
@@ -176,7 +176,7 @@ public class VotingParameters {
     }
 
     public static void main(String... args) {
-        new Program(args) {
+        new Program() {
             @Argument(
                     shortname = "b",
                     longname = "bits",
@@ -199,7 +199,7 @@ public class VotingParameters {
                 System.out.println("q: 0x0" + vp.getQ().toString(16));
                 System.out.println("g: 0x0" + vp.getG().toString(16));
             }
-        }.startWithoutScheduler();
+        }.startWithoutScheduler(args);
     }
 
 }