diff --git a/rigs/yaesu/ft1200.h b/rigs/yaesu/ft1200.h
index 9e92747fa..63286d164 100644
--- a/rigs/yaesu/ft1200.h
+++ b/rigs/yaesu/ft1200.h
@@ -29,7 +29,7 @@
 #ifndef _FT1200_H
 #define _FT1200_H 1
 
-#define FT1200_VFO_ALL (RIG_VFO_A|RIG_VFO_B)
+#define FT1200_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
 
 /* Receiver caps */
 
diff --git a/rigs/yaesu/ft5000.h b/rigs/yaesu/ft5000.h
index 27866af76..db32b61b6 100644
--- a/rigs/yaesu/ft5000.h
+++ b/rigs/yaesu/ft5000.h
@@ -28,7 +28,7 @@
 #ifndef _FT5000_H
 #define _FT5000_H 1
 
-#define FTDX5000_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB)
+#define FTDX5000_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
 
 /* Receiver caps */
 
diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c
index 0f958b322..0ddb5cc22 100644
--- a/rigs/yaesu/ft891.c
+++ b/rigs/yaesu/ft891.c
@@ -98,7 +98,6 @@ const struct rig_caps ft891_caps =
     .str_cal =            FT891_STR_CAL,
     .chan_list =          {
         {   1,  99, RIG_MTYPE_MEM,  NEWCAT_MEM_CAP },
-        { 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP },    /* two by two */
         RIG_CHAN_END,
     },
 
diff --git a/rigs/yaesu/ft891.h b/rigs/yaesu/ft891.h
index 6ae7e29db..e95401aee 100644
--- a/rigs/yaesu/ft891.h
+++ b/rigs/yaesu/ft891.h
@@ -28,7 +28,7 @@
 #ifndef _FT891_H
 #define _FT891_H 1
 
-#define FT891_VFO_ALL (RIG_VFO_A|RIG_VFO_B)
+#define FT891_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
 
 /* Receiver caps */
 
diff --git a/rigs/yaesu/ft991.h b/rigs/yaesu/ft991.h
index 79368e90d..4557d1a13 100644
--- a/rigs/yaesu/ft991.h
+++ b/rigs/yaesu/ft991.h
@@ -28,7 +28,7 @@
 #ifndef _FT991_H
 #define _FT991_H 1
 
-#define FT991_VFO_ALL (RIG_VFO_A|RIG_VFO_B)
+#define FT991_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
 
 /* Receiver caps */
 
diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index 38c800616..b340a4c3b 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -37,6 +37,8 @@
 #include "newcat.h"
 #include "ftdx101.h"
 
+cal_table_float_t yaesu_ftdx101d_swr_cal = FTDX101D_SWR_CAL;
+
 const struct rig_caps ftdx101d_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX101D),
@@ -81,10 +83,9 @@ const struct rig_caps ftdx101d_caps =
     .transceive =         RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
     .bank_qty =           0,
     .chan_desc_sz =       0,
-    .str_cal =            FTDX101_STR_CAL,
+    .swr_cal =            FTDX101D_SWR_CAL,
     .chan_list =          {
         {   1,  99, RIG_MTYPE_MEM,  NEWCAT_MEM_CAP },
-        { 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP },    /* two by two */
         RIG_CHAN_END,
     },
 
diff --git a/rigs/yaesu/ftdx101.h b/rigs/yaesu/ftdx101.h
index f7fd9d9ef..b810fcb7b 100644
--- a/rigs/yaesu/ftdx101.h
+++ b/rigs/yaesu/ftdx101.h
@@ -29,7 +29,7 @@
 #ifndef _FTDX101_H
 #define _FTDX101_H 1
 
-#define FTDX101_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB)
+#define FTDX101_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
 
 /* Receiver caps */
 
@@ -71,26 +71,20 @@
                RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\
                RIG_OP_TO_VFO|RIG_OP_FROM_VFO|RIG_OP_TOGGLE)
 
-/* TBC */
-#define FTDX101_STR_CAL { 16, \
-	       { \
-			{   0, -54 }, /*  S0 */ \
-			{  12, -48 }, /*  S1 */ \
-			{  27, -42 }, /*  S2 */ \
-			{  40, -36 }, /*  S3 */ \
-			{  55, -30 }, /*  S4 */ \
-			{  65, -24 }, /*  S5 */ \
-			{  80, -18 }, /*  S6 */ \
-			{  95, -12 }, /*  S7 */ \
-			{ 112,  -6 }, /*  S8 */ \
-			{ 130,   0 }, /*  S9 */ \
-			{ 150,  10 }, /* +10 */ \
-			{ 172,  20 }, /* +20 */ \
-			{ 190,  30 }, /* +30 */ \
-			{ 220,  40 }, /* +40 */ \
-			{ 240,  50 }, /* +50 */ \
-			{ 255,  60 }, /* +60 */ \
-		} }
+#define FTDX101D_SWR_CAL \
+    { \
+        8, \
+        { \
+            {0, 1.0f}, \
+            {26, 1.2f}, \
+            {52, 1.5f}, \
+            {89, 2.0f}, \
+            {126, 3.0f}, \
+            {173, 4.0f}, \
+            {236, 5.0f}, \
+            {255, 25.0f}, \
+        } \
+    }
 
 /*
  * Other features (used by rig_caps)
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 2f275bde1..d04983694 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -130,12 +130,14 @@ const cal_table_t yaesu_default_str_cal =
     }
 };
 
+/**
+ * First cut at generic Yaesu table, need more points probably
+ * based on testing by Adam M7OTP on FT-991
+ */
 const cal_table_float_t yaesu_default_swr_cal =
 {
     5,
     {
-        // first cut at generic Yaesu table, need more points probably
-        // based on testing by Adam M7OTP on FT-991
         {12, 1.0f},
         {39, 1.35f},
         {65, 1.5f},
@@ -144,24 +146,7 @@ const cal_table_float_t yaesu_default_swr_cal =
     }
 };
 
-const cal_table_float_t yaesu_ftdx101d_swr_cal =
-{
-    8,
-    {
-        // first cut at generic Yaesu table, need more points probably
-        // based on testing by Adam M7OTP on FT-991
-        {0, 1.0f},
-        {26, 1.2f},
-        {52, 1.5f},
-        {89, 2.0f},
-        {126, 3.0f},
-        {173, 4.0f},
-        {236, 5.0f},
-        {255, 25.0f},
-    }
-};
-
-// TBC
+// TODO: Provide sane defaults
 const cal_table_float_t yaesu_default_alc_cal =
 {
     3,
@@ -172,7 +157,7 @@ const cal_table_float_t yaesu_default_alc_cal =
     }
 };
 
-// TBC
+// TODO: Provide sane defaults
 const cal_table_float_t yaesu_default_comp_meter_cal =
 {
     2,
@@ -182,7 +167,7 @@ const cal_table_float_t yaesu_default_comp_meter_cal =
     }
 };
 
-// TBC
+// TODO: Provide sane defaults
 const cal_table_float_t yaesu_default_rfpower_meter_cal =
 {
     2,
@@ -192,7 +177,7 @@ const cal_table_float_t yaesu_default_rfpower_meter_cal =
     }
 };
 
-// TBC
+// TODO: Provide sane defaults
 const cal_table_float_t yaesu_default_vd_meter_cal =
 {
     2,
@@ -202,7 +187,7 @@ const cal_table_float_t yaesu_default_vd_meter_cal =
     }
 };
 
-// TBC
+// TODO: Provide sane defaults
 const cal_table_float_t yaesu_default_id_meter_cal =
 {
     2,
@@ -1711,13 +1696,13 @@ int newcat_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
     }
     else if (rit < 0)
     {
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%cRT1%c", cat_term,
-                 labs(rit), cat_term, cat_term);
+        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%c", cat_term,
+                 labs(rit), cat_term);
     }
     else
     {
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%cRT1%c", cat_term,
-                 labs(rit), cat_term, cat_term);
+        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%c", cat_term,
+                 labs(rit), cat_term);
     }
 
     return newcat_set_cmd(rig);
@@ -1806,13 +1791,13 @@ int newcat_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
     }
     else if (xit < 0)
     {
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%cXT1%c", cat_term,
-                 labs(xit), cat_term, cat_term);
+        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%c", cat_term,
+                 labs(xit), cat_term);
     }
     else
     {
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%cXT1%c", cat_term,
-                 labs(xit), cat_term, cat_term);
+        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%c", cat_term,
+                 labs(xit), cat_term);
     }
 
     return newcat_set_cmd(rig);