diff --git a/ubitx_20/cat_libs.ino b/ubitx_20/cat_libs.ino
index 08789ad..d6455e3 100644
--- a/ubitx_20/cat_libs.ino
+++ b/ubitx_20/cat_libs.ino
@@ -60,14 +60,15 @@ void iopSendMode(char cw_mode, char is_usb, char digi_mode, char is_test)
 {
   byte mode;
   
-  if (cw_mode > 0)
-    mode = RIG_MODE_CW;
-  else if (digi_mode > 0)
-    mode = RIG_MODE_DIGI;
-  else if (is_test)
-    mode = RIG_MODE_TEST;
-  else
-    mode = RIG_MODE_SSB;
+  if (cw_mode > 0) {
+    mode = (cw_mode == 1 ? RIG_MODE_CWL : RIG_MODE_CWU);
+  } else if (digi_mode > 0) {
+    mode = (is_usb ? RIG_MODE_DGU : RIG_MODE_DGL);
+  } else if (is_test) {
+    mode = (is_usb ? RIG_MODE_TTU : RIG_MODE_TTL);
+  } else {
+    mode = (is_usb ? RIG_MODE_USB : RIG_MODE_LSB);
+  }
   sendIOPModeCommand(mode);
 }
 
@@ -887,7 +888,7 @@ void Check_Cat(byte fromType)
     // following assumes it's a status message, 4 chars (including trailing null, which I'm ignoring...
     switch(msg.id) {
       case IOP_SSB_STATUS_MSG:
-      case IOP_DIGI_STATUS_MSG:
+      case IOP_DGT_STATUS_MSG:
       case IOP_CW_STATUS_MSG:
       case IOP_TEST_STATUS_MSG:
       iopStatusWindow[0] = msg.data[0];