@@ -1,13 +1,14 @@
 /*
  * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com>
  *
- * Provides BIO layer to interface openssl to Tcl.
+ * Provides BIO layer to interface OpenSSL to TCL.
  */
 
 #include "tlsInt.h"
 
+/* Called by SSL_write() */
 static int BioWrite(BIO *bio, const char *buf, int bufLen) {
     Tcl_Channel chan;
     Tcl_Size ret;
     int tclEofChan, tclErrno;
 
@@ -19,11 +20,11 @@
 
     tclEofChan = Tcl_Eof(chan);
     tclErrno = Tcl_GetErrno();
 
     dprintf("[chan=%p] BioWrite(%d) -> %" TCL_SIZE_MODIFIER "d [tclEof=%d; tclErrno=%d]",
-	(void *) chan, bufLen, ret, tclEofChan, Tcl_GetErrno());
+	(void *) chan, bufLen, ret, tclEofChan, tclErrno);
 
     BIO_clear_flags(bio, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY);
 
     if (tclEofChan && ret <= 0) {
 	dprintf("Got EOF while reading, returning a Connection Reset error which maps to Soft EOF");
@@ -43,11 +44,11 @@
 	} else {
 	    dprintf("It's an unexpected error: %s/%i", Tcl_ErrnoMsg(tclErrno), tclErrno);
 	}
 
     } else {
-	dprintf("Successfully wrote some data");
+	dprintf("Successfully wrote %" TCL_SIZE_MODIFIER "d bytes of data", ret);
     }
 
     if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) {
 	if (BIO_should_read(bio)) {
 	    dprintf("Setting should retry read flag");
@@ -56,10 +57,11 @@
 	}
     }
     return((int) ret);
 }
 
+/* Called by SSL_read()*/
 static int BioRead(BIO *bio, char *buf, int bufLen) {
     Tcl_Channel chan;
     Tcl_Size ret = 0;
     int tclEofChan, tclErrno;
 
@@ -99,11 +101,11 @@
 	} else {
 	    dprintf("It's an unexpected error: %s/%i", Tcl_ErrnoMsg(tclErrno), tclErrno);
 	}
 
     } else {
-	dprintf("Successfully read some data");
+	dprintf("Successfully read %" TCL_SIZE_MODIFIER "d bytes of data", ret);
     }
 
     if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) {
 	if (BIO_should_write(bio)) {
 	    dprintf("Setting should retry write flag");
@@ -119,11 +121,11 @@
 }
 
 static int BioPuts(BIO *bio, const char *str) {
     dprintf("BioPuts(%p, <string:%p>) called", bio, str);
 
-    return BioWrite(bio, str, (int) strlen(str));
+    return(BioWrite(bio, str, (int) strlen(str)));
 }
 
 static long BioCtrl(BIO *bio, int cmd, long num, void *ptr) {
     Tcl_Channel chan;
     long ret = 1;