diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index 1e33c793b6517eb7ff32eb9fa28e6b5ea059190b..27a6777560886f2319d7f553159e4224389e6a4b 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -388,7 +388,7 @@ class Connection {
                     _log.debug("Requesting ack delay of " + delay + "ms for packet " + packet);
             }
             // WHY always set?
-            packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
+            //packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
             
             long timeout = _options.getRTO();
             if (timeout > MAX_RESEND_DELAY)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
index 65ebe4f1f43781449e5d0b5fd4b612011c3af8ae..f9e8cdecf8ef6485df549d880c4317f4f65338ba 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
@@ -333,6 +333,9 @@ class Packet {
      */
     public Signature getOptionalSignature() { return _optionSignature; }
 
+    /** 
+     * This also sets flag FLAG_SIGNATURE_INCLUDED
+     */
     public void setOptionalSignature(Signature sig) { 
         setFlag(FLAG_SIGNATURE_INCLUDED, sig != null);
         _optionSignature = sig; 
@@ -346,6 +349,7 @@ class Packet {
     /** 
      * This sets the from field in the packet to the Destination for the session
      * provided in the constructor.
+     * This also sets flag FLAG_FROM_INCLUDED
      */
     public void setOptionalFrom() { 
         setFlag(FLAG_FROM_INCLUDED, true);
@@ -360,6 +364,9 @@ class Packet {
      */
     public int getOptionalDelay() { return _optionDelay; }
 
+    /** 
+     * Caller must also call setFlag(FLAG_DELAY_REQUESTED)
+     */
     public void setOptionalDelay(int delayMs) {
         if (delayMs > MAX_DELAY_REQUEST)
             _optionDelay = MAX_DELAY_REQUEST;
@@ -375,6 +382,10 @@ class Packet {
      * @return Maximum payload size sender can receive (MRU)
      */
     public int getOptionalMaxSize() { return _optionMaxSize; }
+
+    /** 
+     * This also sets flag FLAG_MAX_PACKET_SIZE_INCLUDED
+     */
     public void setOptionalMaxSize(int numBytes) { 
         setFlag(FLAG_MAX_PACKET_SIZE_INCLUDED, numBytes > 0);
         _optionMaxSize = numBytes;