@@ -25,10 +25,11 @@
 #define BIO_meth_set_ctrl(bio, val)      (bio)->ctrl = val;
 #define BIO_meth_set_create(bio, val)    (bio)->create = val;
 #define BIO_meth_set_destroy(bio, val)   (bio)->destroy = val;
 #endif
 
+/* Called by SSL_write() */
 static int BioWrite(BIO *bio, const char *buf, int bufLen) {
     Tcl_Channel chan;
     Tcl_Size ret;
     int tclEofChan, tclErrno;
 
@@ -48,22 +49,25 @@
 
     if (tclEofChan && ret <= 0) {
 	dprintf("Got EOF while reading, returning a Connection Reset error which maps to Soft EOF");
 	Tcl_SetErrno(ECONNRESET);
 	ret = 0;
+
     } else if (ret == 0) {
 	dprintf("Got 0 from Tcl_WriteRaw, and EOF is not set; ret = 0");
 	dprintf("Setting retry read flag");
 	BIO_set_retry_read(bio);
+
     } else if (ret < 0) {
 	dprintf("We got some kind of I/O error");
 
 	if (tclErrno == EAGAIN) {
 	    dprintf("It's EAGAIN");
 	} else {
 	    dprintf("It's an unexpected error: %s/%i", Tcl_ErrnoMsg(tclErrno), tclErrno);
 	}
+
     } else {
 	dprintf("Successfully wrote %" TCL_SIZE_MODIFIER "d bytes of data", ret);
     }
 
     if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) {
@@ -102,22 +106,25 @@
 
     if (tclEofChan && ret <= 0) {
 	dprintf("Got EOF while reading, returning a Connection Reset error which maps to Soft EOF");
 	Tcl_SetErrno(ECONNRESET);
 	ret = 0;
+
     } else if (ret == 0) {
 	dprintf("Got 0 from Tcl_Read or Tcl_ReadRaw, and EOF is not set; ret = 0");
 	dprintf("Setting retry read flag");
 	BIO_set_retry_read(bio);
+
     } else if (ret < 0) {
 	dprintf("We got some kind of I/O error");
 
 	if (tclErrno == EAGAIN) {
 	    dprintf("It's EAGAIN");
 	} else {
 	    dprintf("It's an unexpected error: %s/%i", Tcl_ErrnoMsg(tclErrno), tclErrno);
 	}
+
     } else {
 	dprintf("Successfully read %" TCL_SIZE_MODIFIER "d bytes of data", ret);
     }
 
     if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) {
@@ -238,11 +245,11 @@
 		ret = 0;
 		break;
 #endif
 	default:
 		dprintf("Got unknown control command (%i)", cmd);
-		ret = -2;
+		ret = 0;
 		break;
     }
     return ret;
 }
 
@@ -255,11 +262,11 @@
     return 1;
 }
 
 static int BioFree(BIO *bio) {
     if (bio == NULL) {
-	return(0);
+	return 0;
     }
 
     dprintf("BioFree(%p) called", bio);
 
     if (BIO_get_shutdown(bio)) {
@@ -302,11 +309,11 @@
     }
 
     if (statePtr == NULL) {
 	dprintf("Asked to setup a NULL state, just creating the initial configuration");
 
-	return(NULL);
+	return NULL;
     }
 
 #ifdef TCLTLS_SSL_USE_FASTPATH
     /*
      * If the channel can be mapped back to a file descriptor, just use the file descriptor
@@ -333,17 +340,17 @@
 
     if (validParentChannelFd) {
 	dprintf("We found a shortcut, this channel is backed by a socket: %i", parentChannelFdIn);
 	bio = BIO_new_socket(parentChannelFd, flags);
 	statePtr->flags |= TLS_TCL_FASTPATH;
-	return(bio);
+	return bio;
     }
 
     dprintf("Falling back to Tcl I/O for this channel");
 #endif
 
     bio = BIO_new(BioMethods);
     BIO_set_data(bio, statePtr);
     BIO_set_shutdown(bio, flags);
     BIO_set_init(bio, 1);
-    return(bio);
+    return bio;
 }