diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
index 90cbd090018c5f385b4d3586a1fd802f510f13e9..2069005a9bb3863aa5dfa77977f1c8fa6213b32f 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
@@ -26,9 +26,15 @@ import net.i2p.util.Log;
 import net.i2p.util.VersionComparator;
 
 /**
- * Send a file to a peer
+ * Swiss army knife tester.
+ * Sends a file (datafile) to a peer (b64 dest in peerDestFile).
  *
- * Usage: SAMStreamSend samHost samPort peerDestFile dataFile
+ * Usage: SAMStreamSend [options] peerDestFile dataFile
+ *
+ * See apps/sam/doc/README-test.txt for info on test setup.
+ * Sends data in one of 5 modes.
+ * Optionally uses SSL.
+ * Configurable SAM client version.
  *
  */
 public class SAMStreamSend {
diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
index d5f518b8a6312520f829415b72f1e464a53708f9..ef865afcc7067b7fd4fc11a7c8684bc38882846a 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
@@ -28,10 +28,16 @@ import net.i2p.util.Log;
 import net.i2p.util.VersionComparator;
 
 /**
- * Sit around on a SAM destination, receiving lots of data and 
- * writing it to disk
+ * Swiss army knife tester.
+ * Saves our transient b64 destination to myKeyFile where SAMStreamSend can get it.
+ * Saves received data to a file (in sinkDir).
  *
- * Usage: SAMStreamSink samHost samPort myKeyFile sinkDir
+ * Usage: SAMStreamSink [options] myKeyFile sinkDir
+ *
+ * See apps/sam/doc/README-test.txt for info on test setup.
+ * Receives data in one of 7 modes.
+ * Optionally uses SSL.
+ * Configurable SAM client version.
  *
  */
 public class SAMStreamSink {
@@ -46,7 +52,6 @@ public class SAMStreamSink {
     private boolean _isV3;
     private boolean _isV32;
     private String _v3ID;
-    //private boolean _dead;
     /** Connection id (Integer) to peer (Flooder) */
     private final Map<String, Sink> _remotePeers;
     private static I2PSSLSocketFactory _sslSocketFactory;
@@ -140,7 +145,6 @@ public class SAMStreamSink {
     public SAMStreamSink(I2PAppContext ctx, String samHost, String samPort, String destFile, String sinkDir) {
         _context = ctx;
         _log = ctx.logManager().getLog(SAMStreamSink.class);
-        //_dead = false;
         _samHost = samHost;
         _samPort = samPort;
         _destFile = destFile;