diff --git a/lib/termios.c b/lib/termios.c
index 6bf58ffca..460ab9908 100644
--- a/lib/termios.c
+++ b/lib/termios.c
@@ -3347,7 +3347,7 @@ fail:
 	report( message );
 	errno = EBADFD;
 	LEAVE( "serial_select" );
-	return( 1 );
+	return( -1 );
 }
 #ifdef asdf
 int  win32_serial_select( int  n,  fd_set  *readfds,  fd_set  *writefds,
diff --git a/tentec/orion.c b/tentec/orion.c
index d70342958..43660cdac 100644
--- a/tentec/orion.c
+++ b/tentec/orion.c
@@ -127,6 +127,7 @@ static int tt565_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
 	/* Allow transaction re-tries according to capabilities. */
 	for (itry=0; itry < rig->caps->retry; itry++) {
         rs = &rig->state;
+				serial_flush(&rs->rigport); /* discard pending i/p */
         retval = write_block(&rs->rigport, cmd, cmd_len);
         if (retval != RIG_OK)
                 return retval;
diff --git a/tentec/orion.h b/tentec/orion.h
index c94fa1af4..102dfc7b0 100644
--- a/tentec/orion.h
+++ b/tentec/orion.h
@@ -193,7 +193,7 @@ const struct rig_caps tt565_caps = {
 .rig_model =  RIG_MODEL_TT565,
 .model_name = "TT-565 Orion",
 .mfg_name =  "Ten-Tec",
-.version =  "0.5",
+.version =  "0.6",
 .copyright =  "LGPL",
 .status =  RIG_STATUS_BETA,
 .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -207,8 +207,8 @@ const struct rig_caps tt565_caps = {
 .serial_parity =  RIG_PARITY_NONE,
 .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
 .write_delay =  0,          /* no delay between characters written */
-.post_write_delay =  10,    /* ms delay between writes DEBUGGING HERE */
-.timeout =  200,            /* ms */
+.post_write_delay =  0,		  /* ms delay between writes DEBUGGING HERE */
+.timeout =  2000,						/* ms */
 .retry =  4,
 
 .has_get_func =  TT565_FUNCS,
@@ -410,7 +410,7 @@ const struct rig_caps tt599_caps = {
 .rig_model =  RIG_MODEL_TT599,
 .model_name = "TT-599 Eagle",
 .mfg_name =  "Ten-Tec",
-.version =  "0.4",
+.version =  "0.5",
 .copyright =  "LGPL",
 .status =  RIG_STATUS_UNTESTED,
 .rig_type =  RIG_TYPE_TRANSCEIVER,
@@ -424,9 +424,9 @@ const struct rig_caps tt599_caps = {
 .serial_parity =  RIG_PARITY_NONE,
 .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
 .write_delay =  0,          /* no delay between characters written */
-.post_write_delay =  10,    /* ms delay between writes DEBUGGING HERE */
-.timeout =  200,            /* ms */
-.retry =  3,
+.post_write_delay =  0,		  /* ms delay between writes DEBUGGING HERE */
+.timeout =  2000,						/* ms */
+.retry =  4,
 
 .has_get_func =  TT599_FUNCS,
 .has_set_func =  TT599_FUNCS,