From 4568484c88b8974d0a69c5cdf3c0c9257ed3b15a Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Sun, 26 Nov 2023 14:16:05 +0000
Subject: [PATCH] Change way rigs store values

---
 README.md             |   4 +-
 cwsender.cpp          |   4 +-
 rigcommander.cpp      |  28 +-
 rigcreator.cpp        |  38 +-
 rigs/DEFAULT-ICOM.rig |  21 +-
 rigs/IC-705.rig       | 338 +++++++++---------
 rigs/IC-706.rig       |  29 +-
 rigs/IC-706MK2G.rig   |  33 +-
 rigs/IC-7100.rig      | 249 +++++++------
 rigs/IC-718.rig       |  35 +-
 rigs/IC-7300.rig      | 226 ++++++------
 rigs/IC-746.rig       | 276 +++++++--------
 rigs/IC-746PRO.rig    |  58 ++-
 rigs/IC-756.rig       |  36 +-
 rigs/IC-756PRO.rig    |  72 ++--
 rigs/IC-756PROII.rig  | 172 +++++----
 rigs/IC-756PROIII.rig | 172 +++++----
 rigs/IC-7610.rig      | 371 ++++++++++----------
 rigs/IC-785x.rig      | 104 +++---
 rigs/IC-905.rig       | 795 +++++++++++++++++++++---------------------
 rigs/IC-9700.rig      | 750 ++++++++++++++++++++-------------------
 wfmain.cpp            |   2 +-
 22 files changed, 1846 insertions(+), 1967 deletions(-)

diff --git a/README.md b/README.md
index 2e69d58..5618d5d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Other models to be tested/added (including the IC-705)..
 
 website - [WFVIEW](https://wfview.org/) wfview.org
 
-wfview supports viewing the spectrum display waterfall and most normal radio controls. Using wfview, the radio can be operated using the mouse, or just the keyboard (great for those with visual impairments), or even a touch screen display. The gorgous waterfall spectrum can be displayed on a monitor of any size, and can even projected onto a wall for a presentation. Even a VNC session can make use of wfview for interesting remote rig possibilities. wfview runs on humble hardware, ranging from the $35 Raspberry Pi, to laptops, to desktops. wfview is designed to run on GNU Linux, but can probably be adapted to run on other operating systems. In fact we do have  working example in windows as well.
+wfview supports viewing the spectrum display waterfall and most normal radio controls. Using wfview, the radio can be operated using the mouse, or just the keyboard (great for those with visual impairments), or even a touch screen display. The gorgous waterfall spectrum can be displayed on a monitor of any size, and can even projected onto a wall for a presentation. Even a VNC session can make use of wfview for interesting remote rig possibilities. wfview runs on humble hardware, ranging from the $35 Raspberry Pi, to laptops, to desktops. wfview was originally designed to run on GNU Linux, but has since been adapted to work on MacOS and Windows.
 
 
 
@@ -122,5 +122,5 @@ see [QCP] (https://www.qcustomplot.com/)
 
 
 
-If you feel that we forgot ayone, just drop a mail.
+If you feel that we forgot anyone, just drop a mail.
 
diff --git a/cwsender.cpp b/cwsender.cpp
index 5417013..3265b40 100644
--- a/cwsender.cpp
+++ b/cwsender.cpp
@@ -96,9 +96,9 @@ void cwSender::showEvent(QShowEvent *event)
 
 void cwSender::handleKeySpeed(unsigned char wpm)
 {
-    qInfo(logCW()) << "Received key speed" << wpm;
     if (wpm != ui->wpmSpin->value() && (wpm >= ui->wpmSpin->minimum()) && (wpm <= ui->wpmSpin->maximum()))
     {
+        qInfo(logCW()) << "Received new key speed" << wpm;
         ui->wpmSpin->blockSignals(true);
         QMetaObject::invokeMethod(ui->wpmSpin, "setValue", Qt::QueuedConnection, Q_ARG(int, wpm));
         ui->wpmSpin->blockSignals(false);
@@ -107,7 +107,7 @@ void cwSender::handleKeySpeed(unsigned char wpm)
             tone->setSpeed(wpm);
         }, Qt::QueuedConnection);
 #else
-        emit setKeySpeed(ratio);
+        emit setKeySpeed(ratio); // This will also send back to rig (but not a major issue)
 #endif
 
     }
diff --git a/rigcommander.cpp b/rigcommander.cpp
index 1d7030f..a474919 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -2014,8 +2014,8 @@ void rigCommander::parseCommand()
     {
         modeInfo m;
         // New format payload with mode+datamode+filter
-        m = parseMode(uchar(payloadIn[0]), uchar(payloadIn[2]),sub);
-        m.data = uchar(payloadIn[1]);
+        m = parseMode(bcdHexToUChar(payloadIn[0]), bcdHexToUChar(payloadIn[2]),sub);
+        m.data = bcdHexToUChar(payloadIn[1]);
         m.VFO = selVFO_t(sub);
         value.setValue(m);
         break;
@@ -2057,7 +2057,7 @@ void rigCommander::parseCommand()
     // These return a single byte that we convert to a uchar (0-99)
     case funcTuningStep:
     case funcAttenuator:
-        value.setValue(static_cast<uchar>(uchar(payloadIn[0])));
+        value.setValue(bcdHexToUChar(payloadIn[0]));
         break;
     // Return a duplexMode_t for split or duplex (same function)
     case funcSplitStatus:
@@ -2066,7 +2066,7 @@ void rigCommander::parseCommand()
     case funcAntenna:
     {
         antennaInfo ant;
-        ant.antenna = static_cast<uchar>(payloadIn[0]);
+        ant.antenna = bcdHexToUChar(payloadIn[0]);
         ant.rx = static_cast<bool>(payloadIn[1]);
         value.setValue(ant);
         break;
@@ -2124,7 +2124,7 @@ void rigCommander::parseCommand()
     case funcManualNotchWidth:
     case funcSSBTXBandwidth:
     case funcDSPIFFilter:
-        value.setValue(uchar(payloadIn[0]));
+        value.setValue(bcdHexToUChar(payloadIn[0]));
         break;
     // The following group ALL return bool
     case funcNoiseBlanker:
@@ -4052,7 +4052,7 @@ void rigCommander::determineRigCaps()
                 funcs func = funcsLookup.find(settings->value("Type", "").toString().toUpper()).value();
                             rigCaps.commands.insert(func, funcType(func, funcString[int(func)],
                                 QByteArray::fromHex(settings->value("String", "").toString().toUtf8()),
-                                settings->value("Min", 0).toString().toInt(), settings->value("Max", 0).toString().toInt(),
+                                                       settings->value("Min", 0).toInt(NULL), settings->value("Max", 0).toInt(NULL),
                                 settings->value("Command29",false).toBool()));
 
                             rigCaps.commandsReverse.insert(QByteArray::fromHex(settings->value("String", "").toString().toUtf8()),func);
@@ -4127,7 +4127,7 @@ void rigCommander::determineRigCaps()
         for (int c = 0; c < numPreamps; c++)
         {
             settings->setArrayIndex(c);
-            rigCaps.preamps.push_back(genericType(settings->value("Num", 0).toString().toUInt(), settings->value("Name", 0).toString()));
+            rigCaps.preamps.push_back(genericType(settings->value("Num", 0).toString().toUInt(nullptr,16), settings->value("Name", 0).toString()));
         }
         settings->endArray();
     }
@@ -4140,7 +4140,7 @@ void rigCommander::determineRigCaps()
         for (int c = 0; c < numAntennas; c++)
         {
             settings->setArrayIndex(c);
-            rigCaps.antennas.push_back(genericType(settings->value("Num", 0).toString().toUInt(), settings->value("Name", 0).toString()));
+            rigCaps.antennas.push_back(genericType(settings->value("Num", 0).toString().toUInt(nullptr,16), settings->value("Name", 0).toString()));
         }
         settings->endArray();
     }
@@ -4153,7 +4153,8 @@ void rigCommander::determineRigCaps()
         for (int c = 0; c < numAttenuators; c++)
         {
             settings->setArrayIndex(c);
-            rigCaps.attenuators.push_back((unsigned char)settings->value("dB", 0).toUInt());
+            qInfo(logRig()) << "** GOT ATTENUATOR" << settings->value("dB", 0).toString().toUInt();
+            rigCaps.attenuators.push_back((unsigned char)settings->value("dB", 0).toString().toUInt());
         }
         settings->endArray();
     }
@@ -4166,7 +4167,7 @@ void rigCommander::determineRigCaps()
         for (int c = 0; c < numFilters; c++)
         {
             settings->setArrayIndex(c);
-            rigCaps.filters.push_back(filterType(settings->value("Num", 0).toString().toUInt(), settings->value("Name", "").toString(), settings->value("Modes", 0).toUInt()));
+            rigCaps.filters.push_back(filterType(settings->value("Num", 0).toString().toUInt(nullptr,0), settings->value("Name", "").toString(), settings->value("Modes", 0).toUInt()));
         }
         settings->endArray();
     }
@@ -5389,11 +5390,8 @@ void rigCommander::receiveCommand(funcs func, QVariant value, bool sub)
             }
             else if (!strcmp(value.typeName(),"uchar"))
             {
-                 if (func == funcDashRatio) {
-                    payload.append(bcdEncodeChar(value.value<uchar>()));
-                 } else {
-                     payload.append(value.value<uchar>());
-                 }
+                payload.append(bcdEncodeChar(value.value<uchar>()));
+                //qInfo(logRig()) << "**** setting uchar value" << funcString[func] << "val" << value.value<uchar>();
             }
             else if (!strcmp(value.typeName(),"ushort"))
             {
diff --git a/rigcreator.cpp b/rigcreator.cpp
index 1e9e839..3c8e0fc 100644
--- a/rigcreator.cpp
+++ b/rigcreator.cpp
@@ -168,8 +168,8 @@ void rigCreator::loadRigFile(QString file)
             }
             ui->commands->model()->setData(ui->commands->model()->index(c,0),settings->value("Type", "").toString());
             ui->commands->model()->setData(ui->commands->model()->index(c,1),settings->value("String", "").toString());
-            ui->commands->model()->setData(ui->commands->model()->index(c,2),QString::number(settings->value("Min", 0).toInt(),16));
-            ui->commands->model()->setData(ui->commands->model()->index(c,3),QString::number(settings->value("Max", 0).toInt(),16));
+            ui->commands->model()->setData(ui->commands->model()->index(c,2),QString::number(settings->value("Min", 0).toInt()));
+            ui->commands->model()->setData(ui->commands->model()->index(c,3),QString::number(settings->value("Max", 0).toInt()));
             ui->commands->setCellWidget(c,4, checkBoxWidget);
 
         }
@@ -266,7 +266,7 @@ void rigCreator::loadRigFile(QString file)
         {
             settings->setArrayIndex(c);
             ui->attenuators->insertRow(ui->attenuators->rowCount());
-            ui->attenuators->model()->setData(ui->attenuators->model()->index(c,0),QString::number(settings->value("dB", 0).toUInt(),16).rightJustified(2,'0'));
+            ui->attenuators->model()->setData(ui->attenuators->model()->index(c,0),QString::number(settings->value("dB", 0).toUInt()).rightJustified(2,'0'));
         }
         settings->endArray();
     }
@@ -282,7 +282,7 @@ void rigCreator::loadRigFile(QString file)
         {
             settings->setArrayIndex(c);
             ui->preamps->insertRow(ui->preamps->rowCount());
-            ui->preamps->model()->setData(ui->preamps->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt(),16).rightJustified(2,'0'));
+            ui->preamps->model()->setData(ui->preamps->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt()).rightJustified(2,'0'));
             ui->preamps->model()->setData(ui->preamps->model()->index(c,1),settings->value("Name", "").toString());
         }
         settings->endArray();
@@ -299,7 +299,7 @@ void rigCreator::loadRigFile(QString file)
         {
             settings->setArrayIndex(c);
             ui->antennas->insertRow(ui->antennas->rowCount());
-            ui->antennas->model()->setData(ui->antennas->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt(),16).rightJustified(2,'0'));
+            ui->antennas->model()->setData(ui->antennas->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt()).rightJustified(2,'0'));
             ui->antennas->model()->setData(ui->antennas->model()->index(c,1),settings->value("Name", "").toString());
         }
         settings->endArray();
@@ -316,7 +316,7 @@ void rigCreator::loadRigFile(QString file)
         {
             settings->setArrayIndex(c);
             ui->tuningSteps->insertRow(ui->tuningSteps->rowCount());
-            ui->tuningSteps->model()->setData(ui->tuningSteps->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt(),16).rightJustified(2,'0'));
+            ui->tuningSteps->model()->setData(ui->tuningSteps->model()->index(c,0),QString::number(settings->value("Num", 0).toUInt()).rightJustified(2,'0'));
             ui->tuningSteps->model()->setData(ui->tuningSteps->model()->index(c,1),settings->value("Name", "").toString());
             ui->tuningSteps->model()->setData(ui->tuningSteps->model()->index(c,2),settings->value("Hz", 0ULL).toInt(),Qt::DisplayRole);
         }
@@ -335,7 +335,7 @@ void rigCreator::loadRigFile(QString file)
             settings->setArrayIndex(c);
             ui->filters->insertRow(ui->filters->rowCount());
             ui->filters->model()->setData(ui->filters->model()->index(c,0),settings->value("Num", 0).toString());
-            ui->filters->model()->setData(ui->filters->model()->index(c,1),QString::number(settings->value("Modes", 0xffffffff).toUInt(),16));
+            ui->filters->model()->setData(ui->filters->model()->index(c,1),QString::number(settings->value("Modes", 0xffffffff).toUInt()));
             ui->filters->model()->setData(ui->filters->model()->index(c,2),settings->value("Name", "").toString());
         }
         settings->endArray();
@@ -449,8 +449,8 @@ void rigCreator::saveRigFile(QString file)
         settings->setArrayIndex(n);
         settings->setValue("Type", (ui->commands->item(n,0) == NULL) ? "" : ui->commands->item(n,0)->text());
         settings->setValue("String", (ui->commands->item(n,1) == NULL) ? "" : ui->commands->item(n,1)->text());
-        settings->setValue("Min", (ui->commands->item(n,2) == NULL) ? 0 : ui->commands->item(n,2)->text().toInt(nullptr,16));
-        settings->setValue("Max", (ui->commands->item(n,3) == NULL) ? 0 : ui->commands->item(n,3)->text().toInt(nullptr,16));
+        settings->setValue("Min", (ui->commands->item(n,2) == NULL) ? 0 : ui->commands->item(n,2)->text().toInt());
+        settings->setValue("Max", (ui->commands->item(n,3) == NULL) ? 0 : ui->commands->item(n,3)->text().toInt());
 
         QCheckBox* chk = ui->commands->cellWidget(n,4)->findChild<QCheckBox*>();
         if (chk != nullptr)
@@ -467,7 +467,7 @@ void rigCreator::saveRigFile(QString file)
     for (int n = 0; n<ui->spans->rowCount();n++)
     {
         settings->setArrayIndex(n);
-        settings->setValue("Num", (ui->spans->item(n,0) == NULL) ? 0 : ui->spans->item(n,0)->text().toUInt(nullptr,16));
+        settings->setValue("Num", (ui->spans->item(n,0) == NULL) ? 0 : ui->spans->item(n,0)->text().toUInt());
         settings->setValue("Name",(ui->spans->item(n,1) == NULL) ? "" : ui->spans->item(n,1)->text());
         settings->setValue("Freq",(ui->spans->item(n,2) == NULL) ? 0U : ui->spans->item(n,2)->text().toUInt());
     }
@@ -480,7 +480,7 @@ void rigCreator::saveRigFile(QString file)
     {
         settings->setArrayIndex(n);
         settings->setValue("Num", (ui->inputs->item(n,0) == NULL) ? 0 : ui->inputs->item(n,0)->text().toUInt());
-        settings->setValue("Reg", (ui->inputs->item(n,1) == NULL) ? 0 : ui->inputs->item(n,1)->text().toUInt(nullptr,16));
+        settings->setValue("Reg", (ui->inputs->item(n,1) == NULL) ? 0 : ui->inputs->item(n,1)->text().toUInt());
         settings->setValue("Name", (ui->inputs->item(n,2) == NULL) ? "" : ui->inputs->item(n,2)->text());
     }
     settings->endArray();
@@ -492,7 +492,7 @@ void rigCreator::saveRigFile(QString file)
     {
         settings->setArrayIndex(n);
         settings->setValue("Num", (ui->bands->item(n,0) == NULL) ? 0 : ui->bands->item(n,0)->text().toUInt() );
-        settings->setValue("BSR", (ui->bands->item(n,1) == NULL) ? 0 : ui->bands->item(n,1)->text().toUInt(nullptr,16) );
+        settings->setValue("BSR", (ui->bands->item(n,1) == NULL) ? 0 : ui->bands->item(n,1)->text().toUInt() );
         settings->setValue("Start", (ui->bands->item(n,2) == NULL) ? 0ULL : ui->bands->item(n,2)->text().toULongLong() );
         settings->setValue("End", (ui->bands->item(n,3) == NULL) ? 0ULL : ui->bands->item(n,3)->text().toULongLong() );
         settings->setValue("Range", (ui->bands->item(n,4) == NULL) ? 0.0 : ui->bands->item(n,4)->text().toDouble() );
@@ -508,7 +508,7 @@ void rigCreator::saveRigFile(QString file)
     {
         settings->setArrayIndex(n);
         settings->setValue("Num", (ui->modes->item(n,0) == NULL) ? 0 : ui->modes->item(n,0)->text().toUInt());
-        settings->setValue("Reg", (ui->modes->item(n,1) == NULL) ? 0 : ui->modes->item(n,1)->text().toInt(nullptr,16));
+        settings->setValue("Reg", (ui->modes->item(n,1) == NULL) ? 0 : ui->modes->item(n,1)->text().toInt());
         settings->setValue("Min",(ui->modes->item(n,2) == NULL) ? 0 : ui->modes->item(n,2)->text().toInt());
         settings->setValue("Max",(ui->modes->item(n,3) == NULL) ? 0 : ui->modes->item(n,3)->text().toInt());
         settings->setValue("Name",(ui->modes->item(n,4) == NULL) ? "" : ui->modes->item(n,4)->text());
@@ -521,7 +521,7 @@ void rigCreator::saveRigFile(QString file)
     for (int n = 0; n<ui->attenuators->rowCount();n++)
     {
         settings->setArrayIndex(n);
-        settings->setValue("dB",(ui->attenuators->item(n,0) == NULL) ? 0 :  ui->attenuators->item(n,0)->text().toUInt(nullptr,16));
+        settings->setValue("dB",(ui->attenuators->item(n,0) == NULL) ? 0 :  ui->attenuators->item(n,0)->text().toUInt());
     }
     settings->endArray();
 
@@ -531,7 +531,7 @@ void rigCreator::saveRigFile(QString file)
     for (int n = 0; n<ui->preamps->rowCount();n++)
     {
         settings->setArrayIndex(n);
-        settings->setValue("Num",(ui->preamps->item(n,0) == NULL) ? 0 :  ui->preamps->item(n,0)->text().toUInt(nullptr,16));
+        settings->setValue("Num",(ui->preamps->item(n,0) == NULL) ? 0 :  ui->preamps->item(n,0)->text().toUInt());
         settings->setValue("Name",(ui->preamps->item(n,1) == NULL) ? "" :  ui->preamps->item(n,1)->text());
     }
     settings->endArray();
@@ -542,7 +542,7 @@ void rigCreator::saveRigFile(QString file)
     for (int n = 0; n<ui->antennas->rowCount();n++)
     {
         settings->setArrayIndex(n);
-        settings->setValue("Num",(ui->antennas->item(n,0) == NULL) ? 0 :  ui->antennas->item(n,0)->text().toUInt(nullptr,16));
+        settings->setValue("Num",(ui->antennas->item(n,0) == NULL) ? 0 :  ui->antennas->item(n,0)->text().toUInt());
         settings->setValue("Name",(ui->antennas->item(n,1) == NULL) ? "" :  ui->antennas->item(n,1)->text());
     }
     settings->endArray();
@@ -554,7 +554,7 @@ void rigCreator::saveRigFile(QString file)
     for (int n = 0; n<ui->tuningSteps->rowCount();n++)
     {
         settings->setArrayIndex(n);
-        settings->setValue("Num",(ui->tuningSteps->item(n,0) == NULL) ? 0 :  ui->tuningSteps->item(n,0)->text().toUInt(nullptr,16));
+        settings->setValue("Num",(ui->tuningSteps->item(n,0) == NULL) ? 0 :  ui->tuningSteps->item(n,0)->text().toUInt());
         settings->setValue("Name",(ui->tuningSteps->item(n,1) == NULL) ? "" :  ui->tuningSteps->item(n,1)->text());
         settings->setValue("Hz",(ui->tuningSteps->item(n,2) == NULL) ? 0ULL :  ui->tuningSteps->item(n,2)->text().toULongLong());
     }
@@ -566,8 +566,8 @@ void rigCreator::saveRigFile(QString file)
     for (int n = 0; n<ui->filters->rowCount();n++)
     {
         settings->setArrayIndex(n);
-        settings->setValue("Num",(ui->filters->item(n,0) == NULL) ? 0 :  ui->filters->item(n,0)->text().toUInt(nullptr,16));
-        settings->setValue("Modes",(ui->filters->item(n,1) == NULL) ? 0xffffffff : ui->filters->item(n,1)->text().toUInt(nullptr,16));
+        settings->setValue("Num",(ui->filters->item(n,0) == NULL) ? 0 :  ui->filters->item(n,0)->text().toUInt());
+        settings->setValue("Modes",(ui->filters->item(n,1) == NULL) ? 0xffffffff : ui->filters->item(n,1)->text().toUInt());
         settings->setValue("Name",(ui->filters->item(n,2) == NULL) ? "" :  ui->filters->item(n,2)->text());
     }
     settings->endArray();
diff --git a/rigs/DEFAULT-ICOM.rig b/rigs/DEFAULT-ICOM.rig
index 7d1ef93..ee13c2f 100644
--- a/rigs/DEFAULT-ICOM.rig
+++ b/rigs/DEFAULT-ICOM.rig
@@ -78,29 +78,29 @@ Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=0
 Bands\1\BSR=0
-Bands\1\Start=10000000000
-Bands\1\End=10500000000
+Bands\1\Start=1410065408
+Bands\1\End=1910065408
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=3cm
 Bands\2\Num=1
 Bands\2\BSR=0
-Bands\2\Start=5650000000
-Bands\2\End=5925000000
+Bands\2\Start=1355032704
+Bands\2\End=1630032704
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=6cm
 Bands\3\Num=2
 Bands\3\BSR=0
-Bands\3\Start=3300000000
-Bands\3\End=3500000000
+Bands\3\Start=0
+Bands\3\End=0
 Bands\3\Range=0
 Bands\3\MemoryGroup=-1
 Bands\3\Name=9cm
 Bands\4\Num=3
 Bands\4\BSR=0
-Bands\4\Start=2300000000
-Bands\4\End=2450000000
+Bands\4\Start=0
+Bands\4\End=0
 Bands\4\Range=0
 Bands\4\MemoryGroup=-1
 Bands\4\Name=13cm
@@ -247,31 +247,26 @@ Bands\24\Name=Gen
 Bands\size=24
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
diff --git a/rigs/IC-705.rig b/rigs/IC-705.rig
index 3ac1c7f..c5b0b2c 100644
--- a/rigs/IC-705.rig
+++ b/rigs/IC-705.rig
@@ -80,27 +80,27 @@ Commands\11\Command29=false
 Commands\12\Type=Memory Mode
 Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=99
+Commands\12\Max=63
 Commands\12\Command29=false
 Commands\13\Type=Memory Write
 Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=99
+Commands\13\Max=63
 Commands\13\Command29=false
 Commands\14\Type=Memory to VFO
 Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=99
+Commands\14\Max=63
 Commands\14\Command29=false
 Commands\15\Type=Memory Clear
 Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=99
+Commands\15\Max=63
 Commands\15\Command29=false
 Commands\16\Type=Scanning
 Commands\16\String=\\x0e
 Commands\16\Min=0
-Commands\16\Max=255
+Commands\16\Max=0
 Commands\16\Command29=false
 Commands\17\Type=Split/Duplex
 Commands\17\String=\\x0f
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Attenuator Status
 Commands\19\String=\\x11
 Commands\19\Min=0
-Commands\19\Max=45
+Commands\19\Max=0
 Commands\19\Command29=false
 Commands\20\Type=Speech
 Commands\20\String=\\x13
@@ -125,97 +125,97 @@ Commands\20\Command29=false
 Commands\21\Type=AF Gain
 Commands\21\String=\\x14\\x01
 Commands\21\Min=0
-Commands\21\Max=255
+Commands\21\Max=0
 Commands\21\Command29=false
 Commands\22\Type=RF Gain
 Commands\22\String=\\x14\\x02
 Commands\22\Min=0
-Commands\22\Max=255
+Commands\22\Max=0
 Commands\22\Command29=false
 Commands\23\Type=Squelch
 Commands\23\String=\\x14\\x03
 Commands\23\Min=0
-Commands\23\Max=255
+Commands\23\Max=0
 Commands\23\Command29=false
 Commands\24\Type=APF Type Level
 Commands\24\String=\\x14\\x05
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=NR Level
 Commands\25\String=\\x14\\x06
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=PBT Inner
 Commands\26\String=\\x14\\x07
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=PBT Outer
 Commands\27\String=\\x14\\x08
 Commands\27\Min=0
-Commands\27\Max=255
+Commands\27\Max=0
 Commands\27\Command29=false
 Commands\28\Type=CW Pitch
 Commands\28\String=\\x14\\x09
 Commands\28\Min=0
-Commands\28\Max=255
+Commands\28\Max=0
 Commands\28\Command29=false
 Commands\29\Type=RF Power
 Commands\29\String=\\x14\\x0a
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
 Commands\30\Type=Mic Gain
 Commands\30\String=\\x14\\x0b
 Commands\30\Min=0
-Commands\30\Max=99
+Commands\30\Max=63
 Commands\30\Command29=false
 Commands\31\Type=Key Speed
 Commands\31\String=\\x14\\x0c
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
 Commands\32\Type=Compressor Level
 Commands\32\String=\\x14\\x0e
 Commands\32\Min=0
-Commands\32\Max=255
+Commands\32\Max=0
 Commands\32\Command29=false
 Commands\33\Type=Break-In Delay
 Commands\33\String=\\x14\\x0f
 Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Max=0
 Commands\33\Command29=false
 Commands\34\Type=NB Level
 Commands\34\String=\\x14\\x12
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
 Commands\35\Type=DIGI-SEL Shift
 Commands\35\String=\\x14\\x13
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=0
 Commands\35\Command29=false
 Commands\36\Type=Drive Gain
 Commands\36\String=\\x14\\x14
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
 Commands\37\Type=Monitor Gain
 Commands\37\String=\\x14\\x15
 Commands\37\Min=0
-Commands\37\Max=255
+Commands\37\Max=0
 Commands\37\Command29=false
 Commands\38\Type=Vox Gain
 Commands\38\String=\\x14\\x16
 Commands\38\Min=0
-Commands\38\Max=255
+Commands\38\Max=0
 Commands\38\Command29=false
 Commands\39\Type=Anti-Vox Gain
 Commands\39\String=\\x14\\x17
 Commands\39\Min=0
-Commands\39\Max=255
+Commands\39\Max=0
 Commands\39\Command29=false
 Commands\40\Type=S Meter Sql Status
 Commands\40\String=\\x15\\x01
@@ -225,7 +225,7 @@ Commands\40\Command29=false
 Commands\41\Type=S Meter
 Commands\41\String=\\x15\\x02
 Commands\41\Min=0
-Commands\41\Max=255
+Commands\41\Max=0
 Commands\41\Command29=false
 Commands\42\Type=Various Squelch
 Commands\42\String=\\x15\\x05
@@ -240,32 +240,32 @@ Commands\43\Command29=false
 Commands\44\Type=Power Meter
 Commands\44\String=\\x15\\x11
 Commands\44\Min=0
-Commands\44\Max=255
+Commands\44\Max=0
 Commands\44\Command29=false
 Commands\45\Type=SWR Meter
 Commands\45\String=\\x15\\x12
 Commands\45\Min=0
-Commands\45\Max=255
+Commands\45\Max=0
 Commands\45\Command29=false
 Commands\46\Type=ALC Meter
 Commands\46\String=\\x15\\x13
 Commands\46\Min=0
-Commands\46\Max=255
+Commands\46\Max=0
 Commands\46\Command29=false
 Commands\47\Type=Comp Meter
 Commands\47\String=\\x15\\x14
 Commands\47\Min=0
-Commands\47\Max=255
+Commands\47\Max=0
 Commands\47\Command29=false
 Commands\48\Type=Vd Meter
 Commands\48\String=\\x15\\x15
 Commands\48\Min=0
-Commands\48\Max=255
+Commands\48\Max=0
 Commands\48\Command29=false
 Commands\49\Type=Id Meter
 Commands\49\String=\\x15\\x16
 Commands\49\Min=0
-Commands\49\Max=255
+Commands\49\Max=0
 Commands\49\Command29=false
 Commands\50\Type=Preamp Status
 Commands\50\String=\\x16\\x02
@@ -375,7 +375,7 @@ Commands\70\Command29=false
 Commands\71\Type=Send CW
 Commands\71\String=\\x17
 Commands\71\Min=0
-Commands\71\Max=30
+Commands\71\Max=0
 Commands\71\Command29=false
 Commands\72\Type=Power Control
 Commands\72\String=\\x18
@@ -390,17 +390,17 @@ Commands\73\Command29=false
 Commands\74\Type=Memory Contents
 Commands\74\String=\\x1a\\00
 Commands\74\Min=0
-Commands\74\Max=99
+Commands\74\Max=63
 Commands\74\Command29=false
 Commands\75\Type=Band Stacking Reg
 Commands\75\String=\\x1a\\x01
 Commands\75\Min=1
-Commands\75\Max=11
+Commands\75\Max=0
 Commands\75\Command29=false
 Commands\76\Type=Filter Width
 Commands\76\String=\\x1a\\x03
 Commands\76\Min=0
-Commands\76\Max=10000
+Commands\76\Max=2710
 Commands\76\Command29=false
 Commands\77\Type=Quick Split
 Commands\77\String=\\x1a\\x05\\x00\\x45
@@ -410,7 +410,7 @@ Commands\77\Command29=false
 Commands\78\Type=REF Adjust
 Commands\78\String=\\x1a\\x05\\x00\\x89
 Commands\78\Min=0
-Commands\78\Max=511
+Commands\78\Max=0
 Commands\78\Command29=false
 Commands\79\Type=CIV Transceive
 Commands\79\String=\\x1a\\x05\\x01\\x12
@@ -420,12 +420,12 @@ Commands\79\Command29=false
 Commands\80\Type=USB Mod Level
 Commands\80\String=\\x1a\\x05\\x01\\x16
 Commands\80\Min=0
-Commands\80\Max=255
+Commands\80\Max=0
 Commands\80\Command29=false
 Commands\81\Type=LAN Mod Level
 Commands\81\String=\\x1a\\x05\\x01\\x17
 Commands\81\Min=0
-Commands\81\Max=255
+Commands\81\Max=0
 Commands\81\Command29=false
 Commands\82\Type=Data Off Mod Input
 Commands\82\String=\\x1a\\x05\\x01\\x18
@@ -454,8 +454,8 @@ Commands\86\Max=0
 Commands\86\Command29=false
 Commands\87\Type=Dash Ratio
 Commands\87\String=\\x1a\\x05\\x02\\x52
-Commands\87\Min=28
-Commands\87\Max=45
+Commands\87\Min=0
+Commands\87\Max=0
 Commands\87\Command29=false
 Commands\88\Type=Data Mode Filter
 Commands\88\String=\\x1a\\x06
@@ -489,8 +489,8 @@ Commands\93\Max=1
 Commands\93\Command29=false
 Commands\94\Type=RIT Frequency
 Commands\94\String=\\x21\\x00
-Commands\94\Min=-9999
-Commands\94\Max=9999
+Commands\94\Min=0
+Commands\94\Max=0
 Commands\94\Command29=false
 Commands\95\Type=RIT Status
 Commands\95\String=\\x21\\x01
@@ -569,8 +569,8 @@ Commands\109\Max=1
 Commands\109\Command29=false
 Commands\110\Type=Scope Main Ref
 Commands\110\String=\\x27\\x19\\x00
-Commands\110\Min=-30
-Commands\110\Max=10
+Commands\110\Min=0
+Commands\110\Max=0
 Commands\110\Command29=false
 Commands\111\Type=Scope Main Speed
 Commands\111\String=\\x27\\x1a\\x00
@@ -595,7 +595,7 @@ Commands\114\Command29=false
 Commands\115\Type=Scope Fixed Edge Freq
 Commands\115\String=\\x27\\x1e
 Commands\115\Min=1
-Commands\115\Max=12
+Commands\115\Max=0
 Commands\115\Command29=false
 Commands\116\Type=Scope Main RBW
 Commands\116\String=\\x27\\x1f\\x00
@@ -656,127 +656,127 @@ Inputs\4\Num=3
 Inputs\4\Reg=0
 Inputs\4\Name=WLAN
 Inputs\size=4
-Bands\1\Num=20
-Bands\1\BSR=1
-Bands\1\Start=1800000
-Bands\1\End=2000000
-Bands\1\Range=2
+Bands\1\Num=5
+Bands\1\BSR=14
+Bands\1\Start=420000000
+Bands\1\End=450000000
+Bands\1\Range=450
 Bands\1\MemoryGroup=-1
-Bands\1\Name=160m
-Bands\2\Num=19
-Bands\2\BSR=2
-Bands\2\Start=3500000
-Bands\2\End=4000000
-Bands\2\Range=6
+Bands\1\Name=70cm
+Bands\2\Num=6
+Bands\2\BSR=13
+Bands\2\Start=144000000
+Bands\2\End=148000000
+Bands\2\Range=148
 Bands\2\MemoryGroup=-1
-Bands\2\Name=80m
-Bands\3\Num=17
-Bands\3\BSR=3
-Bands\3\Start=7000000
-Bands\3\End=7300000
-Bands\3\Range=11
+Bands\2\Name=2m
+Bands\3\Num=7
+Bands\3\BSR=12
+Bands\3\Start=108000000
+Bands\3\End=0
+Bands\3\Range=137
 Bands\3\MemoryGroup=-1
-Bands\3\Name=40m
-Bands\4\Num=16
-Bands\4\BSR=4
-Bands\4\Start=10100000
-Bands\4\End=10150000
-Bands\4\Range=15
+Bands\3\Name=Air
+Bands\4\Num=8
+Bands\4\BSR=11
+Bands\4\Start=74800000
+Bands\4\End=74800000
+Bands\4\Range=108
 Bands\4\MemoryGroup=-1
-Bands\4\Name=30m
-Bands\5\Num=15
-Bands\5\BSR=5
-Bands\5\Start=14000000
-Bands\5\End=14350000
-Bands\5\Range=20
+Bands\4\Name=WFM
+Bands\5\Num=10
+Bands\5\BSR=10
+Bands\5\Start=50000000
+Bands\5\End=54000000
+Bands\5\Range=60
 Bands\5\MemoryGroup=-1
-Bands\5\Name=20m
-Bands\6\Num=14
-Bands\6\BSR=6
-Bands\6\Start=18068000
-Bands\6\End=18168000
-Bands\6\Range=22
+Bands\5\Name=6m
+Bands\6\Num=11
+Bands\6\BSR=9
+Bands\6\Start=28000000
+Bands\6\End=29700000
+Bands\6\Range=45
 Bands\6\MemoryGroup=-1
-Bands\6\Name=17m
-Bands\7\Num=13
-Bands\7\BSR=7
-Bands\7\Start=21000000
-Bands\7\End=21450000
-Bands\7\Range=26
+Bands\6\Name=10m
+Bands\7\Num=12
+Bands\7\BSR=8
+Bands\7\Start=24890000
+Bands\7\End=24990000
+Bands\7\Range=30
 Bands\7\MemoryGroup=-1
-Bands\7\Name=15m
-Bands\8\Num=12
-Bands\8\BSR=8
-Bands\8\Start=24890000
-Bands\8\End=24990000
-Bands\8\Range=30
+Bands\7\Name=12m
+Bands\8\Num=13
+Bands\8\BSR=7
+Bands\8\Start=21000000
+Bands\8\End=21450000
+Bands\8\Range=26
 Bands\8\MemoryGroup=-1
-Bands\8\Name=12m
-Bands\9\Num=11
-Bands\9\BSR=9
-Bands\9\Start=28000000
-Bands\9\End=29700000
-Bands\9\Range=45
+Bands\8\Name=15m
+Bands\9\Num=14
+Bands\9\BSR=6
+Bands\9\Start=18068000
+Bands\9\End=18168000
+Bands\9\Range=22
 Bands\9\MemoryGroup=-1
-Bands\9\Name=10m
-Bands\10\Num=10
-Bands\10\BSR=16
-Bands\10\Start=50000000
-Bands\10\End=54000000
-Bands\10\Range=60
+Bands\9\Name=17m
+Bands\10\Num=15
+Bands\10\BSR=5
+Bands\10\Start=14000000
+Bands\10\End=14350000
+Bands\10\Range=20
 Bands\10\MemoryGroup=-1
-Bands\10\Name=6m
-Bands\11\Num=8
-Bands\11\BSR=17
-Bands\11\Start=74800000
-Bands\11\End=74800000
-Bands\11\Range=108
+Bands\10\Name=20m
+Bands\11\Num=16
+Bands\11\BSR=4
+Bands\11\Start=10100000
+Bands\11\End=10150000
+Bands\11\Range=15
 Bands\11\MemoryGroup=-1
-Bands\11\Name=WFM
-Bands\12\Num=7
-Bands\12\BSR=18
-Bands\12\Start=108000000
-Bands\12\End=0
-Bands\12\Range=137
+Bands\11\Name=30m
+Bands\12\Num=17
+Bands\12\BSR=3
+Bands\12\Start=7000000
+Bands\12\End=7300000
+Bands\12\Range=11
 Bands\12\MemoryGroup=-1
-Bands\12\Name=Air
-Bands\13\Num=6
-Bands\13\BSR=19
-Bands\13\Start=144000000
-Bands\13\End=148000000
-Bands\13\Range=148
+Bands\12\Name=40m
+Bands\13\Num=18
+Bands\13\BSR=15
+Bands\13\Start=493000
+Bands\13\End=595000
+Bands\13\Range=8
 Bands\13\MemoryGroup=-1
-Bands\13\Name=2m
-Bands\14\Num=5
-Bands\14\BSR=20
-Bands\14\Start=420000000
-Bands\14\End=450000000
-Bands\14\Range=450
+Bands\13\Name=630m
+Bands\14\Num=19
+Bands\14\BSR=2
+Bands\14\Start=3500000
+Bands\14\End=4000000
+Bands\14\Range=6
 Bands\14\MemoryGroup=-1
-Bands\14\Name=70cm
-Bands\15\Num=18
-Bands\15\BSR=21
-Bands\15\Start=493000
-Bands\15\End=595000
-Bands\15\Range=8
+Bands\14\Name=80m
+Bands\15\Num=20
+Bands\15\BSR=1
+Bands\15\Start=1800000
+Bands\15\End=2000000
+Bands\15\Range=2
 Bands\15\MemoryGroup=-1
-Bands\15\Name=630m
+Bands\15\Name=160m
 Bands\16\Num=21
-Bands\16\BSR=21
+Bands\16\BSR=15
 Bands\16\Start=135000
 Bands\16\End=138000
 Bands\16\Range=0
 Bands\16\MemoryGroup=-1
 Bands\16\Name=2200m
 Bands\17\Num=22
-Bands\17\BSR=21
+Bands\17\BSR=15
 Bands\17\Start=10000
 Bands\17\End=30000000
 Bands\17\Range=1.6
 Bands\17\MemoryGroup=-1
 Bands\17\Name=Gen
 Bands\18\Num=23
-Bands\18\BSR=21
+Bands\18\BSR=15
 Bands\18\Start=5250000
 Bands\18\End=5450000
 Bands\18\Range=0
@@ -785,67 +785,57 @@ Bands\18\Name=60m
 Bands\size=18
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=1
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=1
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=1
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=1
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=1
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
-Modes\7\Num=15
-Modes\7\Reg=6
-Modes\7\BW=0
-Modes\7\Min=0
-Modes\7\Max=0
-Modes\7\Name=WFM
-Modes\8\Num=6
-Modes\8\Reg=7
-Modes\8\BW=1
+Modes\7\Num=6
+Modes\7\Reg=7
+Modes\7\Min=50
+Modes\7\Max=3600
+Modes\7\Name=CW-R
+Modes\8\Num=7
+Modes\8\Reg=8
 Modes\8\Min=50
-Modes\8\Max=3600
-Modes\8\Name=CW-R
-Modes\9\Num=7
-Modes\9\Reg=8
-Modes\9\BW=1
-Modes\9\Min=50
-Modes\9\Max=2700
-Modes\9\Name=RTTY-R
-Modes\10\Num=12
-Modes\10\Reg=23
-Modes\10\BW=0
+Modes\8\Max=2700
+Modes\8\Name=RTTY-R
+Modes\9\Num=12
+Modes\9\Reg=17
+Modes\9\Min=0
+Modes\9\Max=0
+Modes\9\Name=DV
+Modes\10\Num=15
+Modes\10\Reg=6
 Modes\10\Min=0
 Modes\10\Max=0
-Modes\10\Name=DV
+Modes\10\Name=WFM
 Modes\size=10
 Attenuators\1\dB=0
-Attenuators\2\dB=20
+Attenuators\2\dB=14
 Attenuators\size=2
 Preamps\1\Num=0
 Preamps\1\Name=OFF
@@ -894,16 +884,16 @@ Tuning%20Steps\12\Hz=10000
 Tuning%20Steps\13\Num=9
 Tuning%20Steps\13\Name=12.5 KHz
 Tuning%20Steps\13\Hz=12500
-Tuning%20Steps\14\Num=16
+Tuning%20Steps\14\Num=10
 Tuning%20Steps\14\Name=20 KHz
 Tuning%20Steps\14\Hz=20000
-Tuning%20Steps\15\Num=17
+Tuning%20Steps\15\Num=11
 Tuning%20Steps\15\Name=25 KHz
 Tuning%20Steps\15\Hz=25000
-Tuning%20Steps\16\Num=18
+Tuning%20Steps\16\Num=12
 Tuning%20Steps\16\Name=50 Khz
 Tuning%20Steps\16\Hz=50000
-Tuning%20Steps\17\Num=19
+Tuning%20Steps\17\Num=13
 Tuning%20Steps\17\Name=100 Khz
 Tuning%20Steps\17\Hz=100000
 Tuning%20Steps\18\Num=0
@@ -914,12 +904,12 @@ Tuning%20Steps\19\Name=1 MHz
 Tuning%20Steps\19\Hz=1000000
 Tuning%20Steps\size=19
 Filters\1\Num=1
-Filters\1\Modes=4294967295
+Filters\1\Modes=0
 Filters\1\Name=FIL1
 Filters\2\Num=2
-Filters\2\Modes=4294967293
+Filters\2\Modes=0
 Filters\2\Name=FIL2
 Filters\3\Num=3
-Filters\3\Modes=4294967293
+Filters\3\Modes=0
 Filters\3\Name=FIL3
 Filters\size=3
diff --git a/rigs/IC-706.rig b/rigs/IC-706.rig
index 94a3c27..c961df9 100644
--- a/rigs/IC-706.rig
+++ b/rigs/IC-706.rig
@@ -80,22 +80,22 @@ Commands\11\Command29=false
 Commands\12\Type=Memory Mode
 Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=101
+Commands\12\Max=65
 Commands\12\Command29=false
 Commands\13\Type=Memory Write
 Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=101
+Commands\13\Max=65
 Commands\13\Command29=false
 Commands\14\Type=Memory to VFO
 Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Clear
 Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Scanning
 Commands\16\String=\\x0e
@@ -133,29 +133,29 @@ Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=0
 Bands\1\BSR=0
-Bands\1\Start=10000000000
-Bands\1\End=10500000000
+Bands\1\Start=1410065408
+Bands\1\End=1910065408
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=3cm
 Bands\2\Num=1
 Bands\2\BSR=0
-Bands\2\Start=5650000000
-Bands\2\End=5925000000
+Bands\2\Start=1355032704
+Bands\2\End=1630032704
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=6cm
 Bands\3\Num=2
 Bands\3\BSR=0
-Bands\3\Start=3300000000
-Bands\3\End=3500000000
+Bands\3\Start=0
+Bands\3\End=0
 Bands\3\Range=0
 Bands\3\MemoryGroup=-1
 Bands\3\Name=9cm
 Bands\4\Num=3
 Bands\4\BSR=0
-Bands\4\Start=2300000000
-Bands\4\End=2450000000
+Bands\4\Start=0
+Bands\4\End=0
 Bands\4\Range=0
 Bands\4\MemoryGroup=-1
 Bands\4\Name=13cm
@@ -302,31 +302,26 @@ Bands\24\Name=Gen
 Bands\size=24
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
diff --git a/rigs/IC-706MK2G.rig b/rigs/IC-706MK2G.rig
index f5850a6..9953e78 100644
--- a/rigs/IC-706MK2G.rig
+++ b/rigs/IC-706MK2G.rig
@@ -80,22 +80,22 @@ Commands\11\Command29=false
 Commands\12\Type=Memory Mode
 Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=101
+Commands\12\Max=65
 Commands\12\Command29=false
 Commands\13\Type=Memory Write
 Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=101
+Commands\13\Max=65
 Commands\13\Command29=false
 Commands\14\Type=Memory to VFO
 Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Clear
 Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Scanning
 Commands\16\String=\\x0e
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Attenuator Status
 Commands\19\String=\\x11
 Commands\19\Min=0
-Commands\19\Max=20
+Commands\19\Max=14
 Commands\19\Command29=false
 Commands\20\Type=Squelch
 Commands\20\String=\\x15\\x01
@@ -193,29 +193,29 @@ Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=0
 Bands\1\BSR=0
-Bands\1\Start=10000000000
-Bands\1\End=10500000000
+Bands\1\Start=1410065408
+Bands\1\End=1910065408
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=3cm
 Bands\2\Num=1
 Bands\2\BSR=0
-Bands\2\Start=5650000000
-Bands\2\End=5925000000
+Bands\2\Start=1355032704
+Bands\2\End=1630032704
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=6cm
 Bands\3\Num=2
 Bands\3\BSR=0
-Bands\3\Start=3300000000
-Bands\3\End=3500000000
+Bands\3\Start=0
+Bands\3\End=0
 Bands\3\Range=0
 Bands\3\MemoryGroup=-1
 Bands\3\Name=9cm
 Bands\4\Num=3
 Bands\4\BSR=0
-Bands\4\Start=2300000000
-Bands\4\End=2450000000
+Bands\4\Start=0
+Bands\4\End=0
 Bands\4\Range=0
 Bands\4\MemoryGroup=-1
 Bands\4\Name=13cm
@@ -362,36 +362,31 @@ Bands\24\Name=Gen
 Bands\size=24
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\size=5
-Attenuators\1\dB=20
+Attenuators\1\dB=14
 Attenuators\size=1
 Preamps\size=0
 Antennas\size=0
diff --git a/rigs/IC-7100.rig b/rigs/IC-7100.rig
index f9f946e..cf9c7a5 100644
--- a/rigs/IC-7100.rig
+++ b/rigs/IC-7100.rig
@@ -75,7 +75,7 @@ Commands\10\Command29=false
 Commands\11\Type=Memory Mode
 Commands\11\String=\\x08
 Commands\11\Min=1
-Commands\11\Max=109
+Commands\11\Max=0
 Commands\11\Command29=false
 Commands\12\Type=Memory Group
 Commands\12\String=\\x08\\xa0
@@ -85,22 +85,22 @@ Commands\12\Command29=false
 Commands\13\Type=Memory Clear
 Commands\13\String=\\x0b
 Commands\13\Min=1
-Commands\13\Max=109
+Commands\13\Max=0
 Commands\13\Command29=false
 Commands\14\Type=Tuning Step
 Commands\14\String=\\x10
 Commands\14\Min=0
-Commands\14\Max=12
+Commands\14\Max=0
 Commands\14\Command29=false
 Commands\15\Type=Tuning Step
 Commands\15\String=\\x10
 Commands\15\Min=0
-Commands\15\Max=18
+Commands\15\Max=12
 Commands\15\Command29=false
 Commands\16\Type=Attenuator Status
 Commands\16\String=\\x11
 Commands\16\Min=0
-Commands\16\Max=32
+Commands\16\Max=20
 Commands\16\Command29=false
 Commands\17\Type=Speech
 Commands\17\String=\\x13
@@ -110,117 +110,117 @@ Commands\17\Command29=false
 Commands\18\Type=AF Gain
 Commands\18\String=\\x14\\x01
 Commands\18\Min=0
-Commands\18\Max=255
+Commands\18\Max=0
 Commands\18\Command29=false
 Commands\19\Type=RF Gain
 Commands\19\String=\\x14\\x02
 Commands\19\Min=0
-Commands\19\Max=255
+Commands\19\Max=0
 Commands\19\Command29=false
 Commands\20\Type=Squelch
 Commands\20\String=\\x14\\x03
 Commands\20\Min=0
-Commands\20\Max=255
+Commands\20\Max=0
 Commands\20\Command29=false
 Commands\21\Type=NR Level
 Commands\21\String=\\x14\\x06
 Commands\21\Min=0
-Commands\21\Max=255
+Commands\21\Max=0
 Commands\21\Command29=false
 Commands\22\Type=PBT Inner
 Commands\22\String=\\x14\\x07
 Commands\22\Min=0
-Commands\22\Max=255
+Commands\22\Max=0
 Commands\22\Command29=false
 Commands\23\Type=PBT Outer
 Commands\23\String=\\x14\\x08
 Commands\23\Min=0
-Commands\23\Max=255
+Commands\23\Max=0
 Commands\23\Command29=false
 Commands\24\Type=CW Pitch
 Commands\24\String=\\x14\\x09
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=RF Power
 Commands\25\String=\\x14\\x0a
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=Mic Gain
 Commands\26\String=\\x14\\x0b
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=Key Speed
 Commands\27\String=\\x14\\x0c
 Commands\27\Min=0
-Commands\27\Max=255
+Commands\27\Max=0
 Commands\27\Command29=false
 Commands\28\Type=Compressor Level
 Commands\28\String=\\x14\\x0e
 Commands\28\Min=0
-Commands\28\Max=255
+Commands\28\Max=0
 Commands\28\Command29=false
 Commands\29\Type=Break-In Delay
 Commands\29\String=\\x14\\x0f
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
 Commands\30\Type=NB Level
 Commands\30\String=\\x14\\x12
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=0
 Commands\30\Command29=false
 Commands\31\Type=Monitor Gain
 Commands\31\String=\\x14\\x15
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
 Commands\32\Type=Vox Gain
 Commands\32\String=\\x14\\x16
 Commands\32\Min=0
-Commands\32\Max=255
+Commands\32\Max=0
 Commands\32\Command29=false
 Commands\33\Type=Anti-Vox Gain
 Commands\33\String=\\x14\\x17
 Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Max=0
 Commands\33\Command29=false
 Commands\34\Type=S Meter
 Commands\34\String=\\x15\\x02
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
 Commands\35\Type=Power Meter
 Commands\35\String=\\x15\\x11
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=0
 Commands\35\Command29=false
 Commands\36\Type=SWR Meter
 Commands\36\String=\\x15\\x12
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
 Commands\37\Type=ALC Meter
 Commands\37\String=\\x15\\x13
 Commands\37\Min=0
-Commands\37\Max=255
+Commands\37\Max=0
 Commands\37\Command29=false
 Commands\38\Type=Comp Meter
 Commands\38\String=\\x15\\x14
 Commands\38\Min=0
-Commands\38\Max=255
+Commands\38\Max=0
 Commands\38\Command29=false
 Commands\39\Type=Vd Meter
 Commands\39\String=\\x15\\x15
 Commands\39\Min=0
-Commands\39\Max=255
+Commands\39\Max=0
 Commands\39\Command29=false
 Commands\40\Type=Id Meter
 Commands\40\String=\\x15\\x16
 Commands\40\Min=0
-Commands\40\Max=255
+Commands\40\Max=0
 Commands\40\Command29=false
 Commands\41\Type=Preamp Status
 Commands\41\String=\\x16\\x02
@@ -300,12 +300,12 @@ Commands\55\Command29=false
 Commands\56\Type=Memory Contents
 Commands\56\String=\\x1a\\x00
 Commands\56\Min=1
-Commands\56\Max=109
+Commands\56\Max=0
 Commands\56\Command29=false
 Commands\57\Type=Band Stacking Reg
 Commands\57\String=\\x1a\\x01
 Commands\57\Min=0
-Commands\57\Max=19
+Commands\57\Max=13
 Commands\57\Command29=false
 Commands\58\Type=Quick Split
 Commands\58\String=\\x1a\\x05\\x00\\x15
@@ -325,7 +325,7 @@ Commands\60\Command29=false
 Commands\61\Type=RIT Status
 Commands\61\String=\\x21\\x00
 Commands\61\Min=0
-Commands\61\Max=9999
+Commands\61\Max=0
 Commands\61\Command29=false
 Commands\62\Type=RIT Frequency
 Commands\62\String=\\x21\\x01
@@ -377,48 +377,48 @@ Inputs\4\Num=3
 Inputs\4\Reg=0
 Inputs\4\Name=USB
 Inputs\size=4
-Bands\1\Num=20
-Bands\1\BSR=1
-Bands\1\Start=1800000
-Bands\1\End=2000000
-Bands\1\Range=2
+Bands\1\Num=5
+Bands\1\BSR=12
+Bands\1\Start=430000000
+Bands\1\End=450000000
+Bands\1\Range=450
 Bands\1\MemoryGroup=-1
-Bands\1\Name=160m
-Bands\2\Num=19
-Bands\2\BSR=2
-Bands\2\Start=3500000
-Bands\2\End=4000000
-Bands\2\Range=6
+Bands\1\Name=70cm
+Bands\2\Num=6
+Bands\2\BSR=11
+Bands\2\Start=144000000
+Bands\2\End=148000000
+Bands\2\Range=148
 Bands\2\MemoryGroup=-1
-Bands\2\Name=80m
-Bands\3\Num=17
-Bands\3\BSR=3
-Bands\3\Start=7000000
-Bands\3\End=7300000
-Bands\3\Range=11
+Bands\2\Name=2m
+Bands\3\Num=9
+Bands\3\BSR=13
+Bands\3\Start=70000000
+Bands\3\End=70500000
+Bands\3\Range=0
 Bands\3\MemoryGroup=-1
-Bands\3\Name=40m
-Bands\4\Num=16
-Bands\4\BSR=4
-Bands\4\Start=10100000
-Bands\4\End=10150000
-Bands\4\Range=15
+Bands\3\Name=4m
+Bands\4\Num=10
+Bands\4\BSR=10
+Bands\4\Start=50000000
+Bands\4\End=54000000
+Bands\4\Range=60
 Bands\4\MemoryGroup=-1
-Bands\4\Name=30m
-Bands\5\Num=15
-Bands\5\BSR=5
-Bands\5\Start=14000000
-Bands\5\End=14350000
-Bands\5\Range=20
+Bands\4\Name=6m
+Bands\5\Num=11
+Bands\5\BSR=9
+Bands\5\Start=28000000
+Bands\5\End=29700000
+Bands\5\Range=45
 Bands\5\MemoryGroup=-1
-Bands\5\Name=20m
-Bands\6\Num=14
-Bands\6\BSR=6
-Bands\6\Start=18068000
-Bands\6\End=18168000
-Bands\6\Range=22
+Bands\5\Name=10m
+Bands\6\Num=12
+Bands\6\BSR=8
+Bands\6\Start=24890000
+Bands\6\End=24990000
+Bands\6\Range=30
 Bands\6\MemoryGroup=-1
-Bands\6\Name=17m
+Bands\6\Name=12m
 Bands\7\Num=13
 Bands\7\BSR=7
 Bands\7\Start=21000000
@@ -426,71 +426,71 @@ Bands\7\End=21450000
 Bands\7\Range=26
 Bands\7\MemoryGroup=-1
 Bands\7\Name=15m
-Bands\8\Num=12
-Bands\8\BSR=8
-Bands\8\Start=24890000
-Bands\8\End=24990000
-Bands\8\Range=30
+Bands\8\Num=14
+Bands\8\BSR=6
+Bands\8\Start=18068000
+Bands\8\End=18168000
+Bands\8\Range=22
 Bands\8\MemoryGroup=-1
-Bands\8\Name=12m
-Bands\9\Num=11
-Bands\9\BSR=9
-Bands\9\Start=28000000
-Bands\9\End=29700000
-Bands\9\Range=45
+Bands\8\Name=17m
+Bands\9\Num=15
+Bands\9\BSR=5
+Bands\9\Start=14000000
+Bands\9\End=14350000
+Bands\9\Range=20
 Bands\9\MemoryGroup=-1
-Bands\9\Name=10m
-Bands\10\Num=10
-Bands\10\BSR=16
-Bands\10\Start=50000000
-Bands\10\End=54000000
-Bands\10\Range=60
+Bands\9\Name=20m
+Bands\10\Num=16
+Bands\10\BSR=4
+Bands\10\Start=10100000
+Bands\10\End=10150000
+Bands\10\Range=15
 Bands\10\MemoryGroup=-1
-Bands\10\Name=6m
-Bands\11\Num=6
-Bands\11\BSR=17
-Bands\11\Start=144000000
-Bands\11\End=148000000
-Bands\11\Range=148
+Bands\10\Name=30m
+Bands\11\Num=17
+Bands\11\BSR=3
+Bands\11\Start=7000000
+Bands\11\End=7300000
+Bands\11\Range=11
 Bands\11\MemoryGroup=-1
-Bands\11\Name=2m
-Bands\12\Num=5
-Bands\12\BSR=18
-Bands\12\Start=430000000
-Bands\12\End=450000000
-Bands\12\Range=450
+Bands\11\Name=40m
+Bands\12\Num=18
+Bands\12\BSR=13
+Bands\12\Start=5250000
+Bands\12\End=5450000
+Bands\12\Range=0
 Bands\12\MemoryGroup=-1
-Bands\12\Name=70cm
-Bands\13\Num=9
-Bands\13\BSR=19
-Bands\13\Start=70000000
-Bands\13\End=70500000
-Bands\13\Range=0
+Bands\12\Name=60m
+Bands\13\Num=19
+Bands\13\BSR=2
+Bands\13\Start=3500000
+Bands\13\End=4000000
+Bands\13\Range=6
 Bands\13\MemoryGroup=-1
-Bands\13\Name=4m
-Bands\14\Num=18
-Bands\14\BSR=19
-Bands\14\Start=5250000
-Bands\14\End=5450000
-Bands\14\Range=0
+Bands\13\Name=80m
+Bands\14\Num=20
+Bands\14\BSR=1
+Bands\14\Start=1800000
+Bands\14\End=2000000
+Bands\14\Range=2
 Bands\14\MemoryGroup=-1
-Bands\14\Name=60m
+Bands\14\Name=160m
 Bands\15\Num=21
-Bands\15\BSR=19
+Bands\15\BSR=13
 Bands\15\Start=493000
 Bands\15\End=595000
 Bands\15\Range=8
 Bands\15\MemoryGroup=-1
 Bands\15\Name=630m
 Bands\16\Num=22
-Bands\16\BSR=19
+Bands\16\BSR=13
 Bands\16\Start=135000
 Bands\16\End=138000
 Bands\16\Range=0
 Bands\16\MemoryGroup=-1
 Bands\16\Name=2200m
 Bands\17\Num=23
-Bands\17\BSR=19
+Bands\17\BSR=13
 Bands\17\Start=10000
 Bands\17\End=30000000
 Bands\17\Range=1.6
@@ -499,61 +499,52 @@ Bands\17\Name=Gen
 Bands\size=17
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=1
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=1
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=1
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=1
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=1
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=1
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=1
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\9\Num=12
-Modes\9\Reg=23
-Modes\9\BW=0
+Modes\9\Reg=17
 Modes\9\Min=0
 Modes\9\Max=0
 Modes\9\Name=DV
 Modes\size=9
 Attenuators\1\dB=0
-Attenuators\2\dB=18
+Attenuators\2\dB=12
 Attenuators\size=2
 Preamps\1\Num=0
 Preamps\1\Name=OFF
@@ -596,23 +587,23 @@ Tuning%20Steps\10\Hz=20000
 Tuning%20Steps\11\Num=9
 Tuning%20Steps\11\Name=25 KHz
 Tuning%20Steps\11\Hz=25000
-Tuning%20Steps\12\Num=16
+Tuning%20Steps\12\Num=10
 Tuning%20Steps\12\Name=50 KHz
 Tuning%20Steps\12\Hz=50000
-Tuning%20Steps\13\Num=17
+Tuning%20Steps\13\Num=11
 Tuning%20Steps\13\Name=100 KHz
 Tuning%20Steps\13\Hz=100000
-Tuning%20Steps\14\Num=18
+Tuning%20Steps\14\Num=12
 Tuning%20Steps\14\Name=1 MHz
 Tuning%20Steps\14\Hz=1000000
 Tuning%20Steps\size=14
 Filters\1\Num=1
-Filters\1\Modes=4294967295
+Filters\1\Modes=0
 Filters\1\Name=FIL1
 Filters\2\Num=2
-Filters\2\Modes=4294967295
+Filters\2\Modes=0
 Filters\2\Name=FIL2
 Filters\3\Num=3
-Filters\3\Modes=4294967295
+Filters\3\Modes=0
 Filters\3\Name=FIL3
 Filters\size=3
diff --git a/rigs/IC-718.rig b/rigs/IC-718.rig
index 23bd217..96ba0ea 100644
--- a/rigs/IC-718.rig
+++ b/rigs/IC-718.rig
@@ -80,22 +80,22 @@ Commands\11\Command29=false
 Commands\12\Type=Memory Mode
 Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=101
+Commands\12\Max=65
 Commands\12\Command29=false
 Commands\13\Type=Memory Write
 Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=101
+Commands\13\Max=65
 Commands\13\Command29=false
 Commands\14\Type=Memory to VFO
 Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Clear
 Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Scanning
 Commands\16\String=\\x0e
@@ -105,7 +105,7 @@ Commands\16\Command29=false
 Commands\17\Type=Split/Duplex
 Commands\17\String=\\x0f
 Commands\17\Min=0
-Commands\17\Max=12
+Commands\17\Max=0
 Commands\17\Command29=false
 Commands\18\Type=Tuning Step
 Commands\18\String=\\x10
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Attenuator Status
 Commands\19\String=\\x11
 Commands\19\Min=0
-Commands\19\Max=20
+Commands\19\Max=14
 Commands\19\Command29=false
 Commands\20\Type=Squelch
 Commands\20\String=\\x15\\x01
@@ -193,29 +193,29 @@ Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=0
 Bands\1\BSR=0
-Bands\1\Start=10000000000
-Bands\1\End=10500000000
+Bands\1\Start=1410065408
+Bands\1\End=1910065408
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=3cm
 Bands\2\Num=1
 Bands\2\BSR=0
-Bands\2\Start=5650000000
-Bands\2\End=5925000000
+Bands\2\Start=1355032704
+Bands\2\End=1630032704
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=6cm
 Bands\3\Num=2
 Bands\3\BSR=0
-Bands\3\Start=3300000000
-Bands\3\End=3500000000
+Bands\3\Start=0
+Bands\3\End=0
 Bands\3\Range=0
 Bands\3\MemoryGroup=-1
 Bands\3\Name=9cm
 Bands\4\Num=3
 Bands\4\BSR=0
-Bands\4\Start=2300000000
-Bands\4\End=2450000000
+Bands\4\Start=0
+Bands\4\End=0
 Bands\4\Range=0
 Bands\4\MemoryGroup=-1
 Bands\4\Name=13cm
@@ -362,36 +362,31 @@ Bands\24\Name=Gen
 Bands\size=24
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\size=5
-Attenuators\1\dB=20
+Attenuators\1\dB=14
 Attenuators\size=1
 Preamps\size=0
 Antennas\size=0
diff --git a/rigs/IC-7300.rig b/rigs/IC-7300.rig
index db60b99..7123c53 100644
--- a/rigs/IC-7300.rig
+++ b/rigs/IC-7300.rig
@@ -80,12 +80,12 @@ Commands\11\Command29=false
 Commands\12\Type=Memory Mode
 Commands\12\String=\\x08
 Commands\12\Min=1
-Commands\12\Max=101
+Commands\12\Max=65
 Commands\12\Command29=false
 Commands\13\Type=Memory Clear
 Commands\13\String=\\x0b
 Commands\13\Min=1
-Commands\13\Max=101
+Commands\13\Max=65
 Commands\13\Command29=false
 Commands\14\Type=Split/Duplex
 Commands\14\String=\\x0f
@@ -100,7 +100,7 @@ Commands\15\Command29=false
 Commands\16\Type=Attenuator Status
 Commands\16\String=\\x11
 Commands\16\Min=0
-Commands\16\Max=20
+Commands\16\Max=14
 Commands\16\Command29=false
 Commands\17\Type=Speech
 Commands\17\String=\\x13
@@ -110,117 +110,117 @@ Commands\17\Command29=false
 Commands\18\Type=AF Gain
 Commands\18\String=\\x14\\x01
 Commands\18\Min=0
-Commands\18\Max=255
+Commands\18\Max=0
 Commands\18\Command29=false
 Commands\19\Type=RF Gain
 Commands\19\String=\\x14\\x02
 Commands\19\Min=0
-Commands\19\Max=255
+Commands\19\Max=0
 Commands\19\Command29=false
 Commands\20\Type=Squelch
 Commands\20\String=\\x14\\x03
 Commands\20\Min=0
-Commands\20\Max=255
+Commands\20\Max=0
 Commands\20\Command29=false
 Commands\21\Type=NR Level
 Commands\21\String=\\x14\\x06
 Commands\21\Min=0
-Commands\21\Max=255
+Commands\21\Max=0
 Commands\21\Command29=false
 Commands\22\Type=PBT Inner
 Commands\22\String=\\x14\\x07
 Commands\22\Min=0
-Commands\22\Max=255
+Commands\22\Max=0
 Commands\22\Command29=false
 Commands\23\Type=PBT Outer
 Commands\23\String=\\x14\\x08
 Commands\23\Min=0
-Commands\23\Max=255
+Commands\23\Max=0
 Commands\23\Command29=false
 Commands\24\Type=CW Pitch
 Commands\24\String=\\x14\\x09
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=RF Power
 Commands\25\String=\\x14\\x0a
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=Mic Gain
 Commands\26\String=\\x14\\x0b
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=Key Speed
 Commands\27\String=\\x14\\x0c
 Commands\27\Min=0
-Commands\27\Max=255
+Commands\27\Max=0
 Commands\27\Command29=false
 Commands\28\Type=Compressor Level
 Commands\28\String=\\x14\\x0e
 Commands\28\Min=0
-Commands\28\Max=255
+Commands\28\Max=0
 Commands\28\Command29=false
 Commands\29\Type=Break-In Delay
 Commands\29\String=\\x14\\x0f
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
 Commands\30\Type=NB Level
 Commands\30\String=\\x14\\x12
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=0
 Commands\30\Command29=false
 Commands\31\Type=Monitor Gain
 Commands\31\String=\\x14\\x15
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
 Commands\32\Type=Vox Gain
 Commands\32\String=\\x14\\x16
 Commands\32\Min=0
-Commands\32\Max=255
+Commands\32\Max=0
 Commands\32\Command29=false
 Commands\33\Type=Anti-Vox Gain
 Commands\33\String=\\x14\\x17
 Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Max=0
 Commands\33\Command29=false
 Commands\34\Type=S Meter
 Commands\34\String=\\x15\\x02
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
 Commands\35\Type=Power Meter
 Commands\35\String=\\x15\\x11
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=0
 Commands\35\Command29=false
 Commands\36\Type=SWR Meter
 Commands\36\String=\\x15\\x12
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
 Commands\37\Type=ALC Meter
 Commands\37\String=\\x15\\x13
 Commands\37\Min=0
-Commands\37\Max=255
+Commands\37\Max=0
 Commands\37\Command29=false
 Commands\38\Type=Comp Meter
 Commands\38\String=\\x15\\x14
 Commands\38\Min=0
-Commands\38\Max=255
+Commands\38\Max=0
 Commands\38\Command29=false
 Commands\39\Type=Vd Meter
 Commands\39\String=\\x15\\x15
 Commands\39\Min=0
-Commands\39\Max=255
+Commands\39\Max=0
 Commands\39\Command29=false
 Commands\40\Type=Id Meter
 Commands\40\String=\\x15\\x16
 Commands\40\Min=0
-Commands\40\Max=255
+Commands\40\Max=0
 Commands\40\Command29=false
 Commands\41\Type=Preamp Status
 Commands\41\String=\\x16\\x02
@@ -295,17 +295,17 @@ Commands\54\Command29=false
 Commands\55\Type=Memory Contents
 Commands\55\String=\\x1a\\x00
 Commands\55\Min=1
-Commands\55\Max=101
+Commands\55\Max=65
 Commands\55\Command29=false
 Commands\56\Type=Band Stacking Reg
 Commands\56\String=\\x1a\\x01
 Commands\56\Min=1
-Commands\56\Max=11
+Commands\56\Max=0
 Commands\56\Command29=false
 Commands\57\Type=Filter Width
 Commands\57\String=\\x1a\\x03
 Commands\57\Min=0
-Commands\57\Max=10000
+Commands\57\Max=2710
 Commands\57\Command29=false
 Commands\58\Type=Quick Split
 Commands\58\String=\\x1a\\x05\\x00\\x30
@@ -330,7 +330,7 @@ Commands\61\Command29=false
 Commands\62\Type=RIT Status
 Commands\62\String=\\x21\\x00
 Commands\62\Min=0
-Commands\62\Max=9999
+Commands\62\Max=0
 Commands\62\Command29=false
 Commands\63\Type=RIT Frequency
 Commands\63\String=\\x21\\x01
@@ -394,8 +394,8 @@ Commands\74\Max=1
 Commands\74\Command29=false
 Commands\75\Type=Scope Main Ref
 Commands\75\String=\\x27\\x19\\x00
-Commands\75\Min=-512
-Commands\75\Max=512
+Commands\75\Min=-200
+Commands\75\Max=200
 Commands\75\Command29=false
 Commands\76\Type=Scope Main Speed
 Commands\76\String=\\x27\\x1a\\x00
@@ -471,48 +471,48 @@ Bands\1\End=70500000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=4m
-Bands\2\Num=18
-Bands\2\BSR=0
-Bands\2\Start=5250000
-Bands\2\End=5450000
-Bands\2\Range=0
+Bands\2\Num=10
+Bands\2\BSR=10
+Bands\2\Start=50000000
+Bands\2\End=54000000
+Bands\2\Range=60
 Bands\2\MemoryGroup=-1
-Bands\2\Name=60m
-Bands\3\Num=21
-Bands\3\BSR=0
-Bands\3\Start=493000
-Bands\3\End=595000
-Bands\3\Range=8
+Bands\2\Name=6m
+Bands\3\Num=11
+Bands\3\BSR=9
+Bands\3\Start=28000000
+Bands\3\End=29700000
+Bands\3\Range=45
 Bands\3\MemoryGroup=-1
-Bands\3\Name=630m
-Bands\4\Num=22
-Bands\4\BSR=0
-Bands\4\Start=135000
-Bands\4\End=138000
-Bands\4\Range=0
+Bands\3\Name=10m
+Bands\4\Num=12
+Bands\4\BSR=8
+Bands\4\Start=24890000
+Bands\4\End=24990000
+Bands\4\Range=30
 Bands\4\MemoryGroup=-1
-Bands\4\Name=2200m
-Bands\5\Num=20
-Bands\5\BSR=1
-Bands\5\Start=1800000
-Bands\5\End=2000000
-Bands\5\Range=2
+Bands\4\Name=12m
+Bands\5\Num=13
+Bands\5\BSR=7
+Bands\5\Start=21000000
+Bands\5\End=21450000
+Bands\5\Range=26
 Bands\5\MemoryGroup=-1
-Bands\5\Name=160m
-Bands\6\Num=19
-Bands\6\BSR=2
-Bands\6\Start=3500000
-Bands\6\End=4000000
-Bands\6\Range=6
+Bands\5\Name=15m
+Bands\6\Num=14
+Bands\6\BSR=6
+Bands\6\Start=18068000
+Bands\6\End=18168000
+Bands\6\Range=22
 Bands\6\MemoryGroup=-1
-Bands\6\Name=80m
-Bands\7\Num=17
-Bands\7\BSR=3
-Bands\7\Start=7000000
-Bands\7\End=7300000
-Bands\7\Range=11
+Bands\6\Name=17m
+Bands\7\Num=15
+Bands\7\BSR=5
+Bands\7\Start=14000000
+Bands\7\End=14350000
+Bands\7\Range=20
 Bands\7\MemoryGroup=-1
-Bands\7\Name=40m
+Bands\7\Name=20m
 Bands\8\Num=16
 Bands\8\BSR=4
 Bands\8\Start=10100000
@@ -520,50 +520,50 @@ Bands\8\End=10150000
 Bands\8\Range=15
 Bands\8\MemoryGroup=-1
 Bands\8\Name=30m
-Bands\9\Num=15
-Bands\9\BSR=5
-Bands\9\Start=14000000
-Bands\9\End=14350000
-Bands\9\Range=20
+Bands\9\Num=17
+Bands\9\BSR=3
+Bands\9\Start=7000000
+Bands\9\End=7300000
+Bands\9\Range=11
 Bands\9\MemoryGroup=-1
-Bands\9\Name=20m
-Bands\10\Num=14
-Bands\10\BSR=6
-Bands\10\Start=18068000
-Bands\10\End=18168000
-Bands\10\Range=22
+Bands\9\Name=40m
+Bands\10\Num=18
+Bands\10\BSR=0
+Bands\10\Start=5250000
+Bands\10\End=5450000
+Bands\10\Range=0
 Bands\10\MemoryGroup=-1
-Bands\10\Name=17m
-Bands\11\Num=13
-Bands\11\BSR=7
-Bands\11\Start=21000000
-Bands\11\End=21450000
-Bands\11\Range=26
+Bands\10\Name=60m
+Bands\11\Num=19
+Bands\11\BSR=2
+Bands\11\Start=3500000
+Bands\11\End=4000000
+Bands\11\Range=6
 Bands\11\MemoryGroup=-1
-Bands\11\Name=15m
-Bands\12\Num=12
-Bands\12\BSR=8
-Bands\12\Start=24890000
-Bands\12\End=24990000
-Bands\12\Range=30
+Bands\11\Name=80m
+Bands\12\Num=20
+Bands\12\BSR=1
+Bands\12\Start=1800000
+Bands\12\End=2000000
+Bands\12\Range=2
 Bands\12\MemoryGroup=-1
-Bands\12\Name=12m
-Bands\13\Num=11
-Bands\13\BSR=9
-Bands\13\Start=28000000
-Bands\13\End=29700000
-Bands\13\Range=45
+Bands\12\Name=160m
+Bands\13\Num=21
+Bands\13\BSR=0
+Bands\13\Start=493000
+Bands\13\End=595000
+Bands\13\Range=8
 Bands\13\MemoryGroup=-1
-Bands\13\Name=10m
-Bands\14\Num=10
-Bands\14\BSR=16
-Bands\14\Start=50000000
-Bands\14\End=54000000
-Bands\14\Range=60
+Bands\13\Name=630m
+Bands\14\Num=22
+Bands\14\BSR=0
+Bands\14\Start=135000
+Bands\14\End=138000
+Bands\14\Range=0
 Bands\14\MemoryGroup=-1
-Bands\14\Name=6m
+Bands\14\Name=2200m
 Bands\15\Num=23
-Bands\15\BSR=17
+Bands\15\BSR=11
 Bands\15\Start=10000
 Bands\15\End=30000000
 Bands\15\Range=1.6
@@ -572,55 +572,47 @@ Bands\15\Name=Gen
 Bands\size=15
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=1
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=1
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=1
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=1
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=1
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=1
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=1
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\size=8
 Attenuators\1\dB=0
-Attenuators\2\dB=16
+Attenuators\2\dB=10
 Attenuators\size=2
 Preamps\1\Num=1
 Preamps\1\Name=PREAMP 1
@@ -660,12 +652,12 @@ Tuning%20Steps\10\Name=25 KHz
 Tuning%20Steps\10\Hz=25000
 Tuning%20Steps\size=10
 Filters\1\Num=1
-Filters\1\Modes=4294967295
+Filters\1\Modes=0
 Filters\1\Name=FIL1
 Filters\2\Num=2
-Filters\2\Modes=4294967295
+Filters\2\Modes=0
 Filters\2\Name=FIL2
 Filters\3\Num=3
-Filters\3\Modes=4294967295
+Filters\3\Modes=0
 Filters\3\Name=FIL3
 Filters\size=3
diff --git a/rigs/IC-746.rig b/rigs/IC-746.rig
index 219723c..ec8b634 100644
--- a/rigs/IC-746.rig
+++ b/rigs/IC-746.rig
@@ -22,240 +22,240 @@ MemStart=1
 MemFormat=
 SatMemories=0
 SatFormat=
-Commands\1\Type=AGC Time Constant
-Commands\1\String=\\x16\\x12
+Commands\1\Type=Freq (TRX)
+Commands\1\String=\\x00
 Commands\1\Min=0
-Commands\1\Max=1
+Commands\1\Max=0
 Commands\1\Command29=false
-Commands\2\Type=Antenna
-Commands\2\String=\\x12
-Commands\2\Min=1
-Commands\2\Max=2
+Commands\2\Type=Mode (TRX)
+Commands\2\String=\\x01
+Commands\2\Min=0
+Commands\2\Max=0
 Commands\2\Command29=false
-Commands\3\Type=APF Type
-Commands\3\String=\\x16\\x32
+Commands\3\Type=Band Edge Freq
+Commands\3\String=\\x02
 Commands\3\Min=0
-Commands\3\Max=1
+Commands\3\Max=0
 Commands\3\Command29=false
-Commands\4\Type=Attenuator Status
-Commands\4\String=\\x11
+Commands\4\Type=Freq Get
+Commands\4\String=\\x03
 Commands\4\Min=0
-Commands\4\Max=20
+Commands\4\Max=0
 Commands\4\Command29=false
-Commands\5\Type=Auto Notch
-Commands\5\String=\\x16\\x41
+Commands\5\Type=Mode Get
+Commands\5\String=\\x04
 Commands\5\Min=0
-Commands\5\Max=1
+Commands\5\Max=0
 Commands\5\Command29=false
-Commands\6\Type=Band Edge Freq
-Commands\6\String=\\x02
+Commands\6\Type=Freq Set
+Commands\6\String=\\x05
 Commands\6\Min=0
 Commands\6\Max=0
 Commands\6\Command29=false
-Commands\7\Type=Band Stacking Reg
-Commands\7\String=\\x1a\\x01
+Commands\7\Type=Mode Set
+Commands\7\String=\\x06
 Commands\7\Min=0
-Commands\7\Max=10
+Commands\7\Max=0
 Commands\7\Command29=false
-Commands\8\Type=Break-In Status
-Commands\8\String=\\x16\\x47
+Commands\8\Type=VFO A Select
+Commands\8\String=\\x07\\x00
 Commands\8\Min=0
-Commands\8\Max=1
+Commands\8\Max=0
 Commands\8\Command29=false
-Commands\9\Type=Command Error FA
-Commands\9\String=\\xfa
+Commands\9\Type=VFO B Select
+Commands\9\String=\\x07\\x01
 Commands\9\Min=0
 Commands\9\Max=0
 Commands\9\Command29=false
-Commands\10\Type=Command OK FB
-Commands\10\String=\\xfb
+Commands\10\Type=VFO Equal AB
+Commands\10\String=\\x07\\xa0
 Commands\10\Min=0
 Commands\10\Max=0
 Commands\10\Command29=false
-Commands\11\Type=Compressor Status
-Commands\11\String=\\x16\\x44
+Commands\11\Type=VFO Swap A/B
+Commands\11\String=\\x07\\xb0
 Commands\11\Min=0
-Commands\11\Max=1
+Commands\11\Max=0
 Commands\11\Command29=false
-Commands\12\Type=CW Pitch
-Commands\12\String=\\x14\\x09
+Commands\12\Type=Memory Mode
+Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=255
+Commands\12\Max=65
 Commands\12\Command29=false
-Commands\13\Type=Duplex Operation
-Commands\13\String=\\x0f
+Commands\13\Type=Memory Write
+Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=12
+Commands\13\Max=65
 Commands\13\Command29=false
-Commands\14\Type=Freq (TRX)
-Commands\14\String=\\x00
+Commands\14\Type=Memory to VFO
+Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=0
+Commands\14\Max=65
 Commands\14\Command29=false
-Commands\15\Type=Freq Get
-Commands\15\String=\\x03
+Commands\15\Type=Memory Clear
+Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=0
+Commands\15\Max=65
 Commands\15\Command29=false
-Commands\16\Type=Freq Set
-Commands\16\String=\\x05
+Commands\16\Type=Scanning
+Commands\16\String=\\x0e
 Commands\16\Min=0
-Commands\16\Max=0
+Commands\16\Max=1
 Commands\16\Command29=false
-Commands\17\Type=IF Filter Width
-Commands\17\String=\\x1a\\x03
+Commands\17\Type=Duplex Operation
+Commands\17\String=\\x0f
 Commands\17\Min=0
 Commands\17\Max=0
 Commands\17\Command29=false
-Commands\18\Type=Key Speed
-Commands\18\String=\\x14\\x0c
+Commands\18\Type=Tuning Step
+Commands\18\String=\\x10
 Commands\18\Min=0
-Commands\18\Max=255
+Commands\18\Max=9
 Commands\18\Command29=false
-Commands\19\Type=Memory Clear
-Commands\19\String=\\x0b
+Commands\19\Type=Attenuator Status
+Commands\19\String=\\x11
 Commands\19\Min=0
-Commands\19\Max=101
+Commands\19\Max=14
 Commands\19\Command29=false
-Commands\20\Type=Memory Contents
-Commands\20\String=\\x1a\\x00
-Commands\20\Min=0
-Commands\20\Max=0
+Commands\20\Type=Antenna
+Commands\20\String=\\x12
+Commands\20\Min=1
+Commands\20\Max=2
 Commands\20\Command29=false
-Commands\21\Type=Memory Mode
-Commands\21\String=\\x08
+Commands\21\Type=PBT Inner
+Commands\21\String=\\x14\\x07
 Commands\21\Min=0
-Commands\21\Max=101
+Commands\21\Max=0
 Commands\21\Command29=false
-Commands\22\Type=Memory to VFO
-Commands\22\String=\\x0a
+Commands\22\Type=PBT Outer
+Commands\22\String=\\x14\\x08
 Commands\22\Min=0
-Commands\22\Max=101
+Commands\22\Max=0
 Commands\22\Command29=false
-Commands\23\Type=Memory Write
-Commands\23\String=\\x09
+Commands\23\Type=CW Pitch
+Commands\23\String=\\x14\\x09
 Commands\23\Min=0
-Commands\23\Max=101
+Commands\23\Max=0
 Commands\23\Command29=false
-Commands\24\Type=Mic Gain
-Commands\24\String=\\x14\\x0b
+Commands\24\Type=RF Power
+Commands\24\String=\\x14\\x0a
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
-Commands\25\Type=Mode (TRX)
-Commands\25\String=\\x01
+Commands\25\Type=Mic Gain
+Commands\25\String=\\x14\\x0b
 Commands\25\Min=0
 Commands\25\Max=0
 Commands\25\Command29=false
-Commands\26\Type=Mode Get
-Commands\26\String=\\x04
+Commands\26\Type=Key Speed
+Commands\26\String=\\x14\\x0c
 Commands\26\Min=0
 Commands\26\Max=0
 Commands\26\Command29=false
-Commands\27\Type=Mode Set
-Commands\27\String=\\x06
+Commands\27\Type=Squelch
+Commands\27\String=\\x15\\x01
 Commands\27\Min=0
 Commands\27\Max=0
 Commands\27\Command29=false
-Commands\28\Type=Noise Blanker
-Commands\28\String=\\x16\\x22
+Commands\28\Type=S Meter
+Commands\28\String=\\x15\\x02
 Commands\28\Min=0
-Commands\28\Max=1
+Commands\28\Max=0
 Commands\28\Command29=false
-Commands\29\Type=Noise Reduction
-Commands\29\String=\\x16\\x40
+Commands\29\Type=Preamp Status
+Commands\29\String=\\x16\\x02
 Commands\29\Min=0
-Commands\29\Max=1
+Commands\29\Max=2
 Commands\29\Command29=false
-Commands\30\Type=PBT Inner
-Commands\30\String=\\x14\\x07
+Commands\30\Type=AGC Time Constant
+Commands\30\String=\\x16\\x12
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=1
 Commands\30\Command29=false
-Commands\31\Type=PBT Outer
-Commands\31\String=\\x14\\x08
+Commands\31\Type=Noise Blanker
+Commands\31\String=\\x16\\x22
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=1
 Commands\31\Command29=false
-Commands\32\Type=Preamp Status
-Commands\32\String=\\x16\\x02
+Commands\32\Type=APF Type
+Commands\32\String=\\x16\\x32
 Commands\32\Min=0
-Commands\32\Max=2
+Commands\32\Max=1
 Commands\32\Command29=false
-Commands\33\Type=Repeater TSQL
-Commands\33\String=\\x16\\x42
+Commands\33\Type=Noise Reduction
+Commands\33\String=\\x16\\x40
 Commands\33\Min=0
 Commands\33\Max=1
 Commands\33\Command29=false
-Commands\34\Type=Repeater TSQL
-Commands\34\String=\\x16\\x43
+Commands\34\Type=Auto Notch
+Commands\34\String=\\x16\\x41
 Commands\34\Min=0
 Commands\34\Max=1
 Commands\34\Command29=false
-Commands\35\Type=RF Power
-Commands\35\String=\\x14\\x0a
+Commands\35\Type=Repeater TSQL
+Commands\35\String=\\x16\\x42
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=1
 Commands\35\Command29=false
-Commands\36\Type=S Meter
-Commands\36\String=\\x15\\x02
+Commands\36\Type=Repeater TSQL
+Commands\36\String=\\x16\\x43
 Commands\36\Min=0
-Commands\36\Max=0
+Commands\36\Max=1
 Commands\36\Command29=false
-Commands\37\Type=Scanning
-Commands\37\String=\\x0e
+Commands\37\Type=Compressor Status
+Commands\37\String=\\x16\\x44
 Commands\37\Min=0
 Commands\37\Max=1
 Commands\37\Command29=false
-Commands\38\Type=Squelch
-Commands\38\String=\\x15\\x01
+Commands\38\Type=Vox Status
+Commands\38\String=\\x16\\x46
 Commands\38\Min=0
-Commands\38\Max=0
+Commands\38\Max=1
 Commands\38\Command29=false
-Commands\39\Type=Tone Frequency
-Commands\39\String=\\x1b\\x00
+Commands\39\Type=Break-In Status
+Commands\39\String=\\x16\\x47
 Commands\39\Min=0
-Commands\39\Max=9999
+Commands\39\Max=1
 Commands\39\Command29=false
 Commands\40\Type=Transceiver ID
 Commands\40\String=\\x19
 Commands\40\Min=0
 Commands\40\Max=0
 Commands\40\Command29=false
-Commands\41\Type=TSQL Frequency
-Commands\41\String=\\x1b\\x01
+Commands\41\Type=Memory Contents
+Commands\41\String=\\x1a\\x00
 Commands\41\Min=0
-Commands\41\Max=9999
+Commands\41\Max=0
 Commands\41\Command29=false
-Commands\42\Type=Tuning Step
-Commands\42\String=\\x10
+Commands\42\Type=Band Stacking Reg
+Commands\42\String=\\x1a\\x01
 Commands\42\Min=0
-Commands\42\Max=9
+Commands\42\Max=0
 Commands\42\Command29=false
-Commands\43\Type=VFO A Select
-Commands\43\String=\\x07\\x00
+Commands\43\Type=IF Filter Width
+Commands\43\String=\\x1a\\x03
 Commands\43\Min=0
 Commands\43\Max=0
 Commands\43\Command29=false
-Commands\44\Type=VFO B Select
-Commands\44\String=\\x07\\x01
+Commands\44\Type=Tone Frequency
+Commands\44\String=\\x1b\\x00
 Commands\44\Min=0
 Commands\44\Max=0
 Commands\44\Command29=false
-Commands\45\Type=VFO Equal AB
-Commands\45\String=\\x07\\xa0
+Commands\45\Type=TSQL Frequency
+Commands\45\String=\\x1b\\x01
 Commands\45\Min=0
 Commands\45\Max=0
 Commands\45\Command29=false
-Commands\46\Type=VFO Swap A/B
-Commands\46\String=\\x07\\xb0
+Commands\46\Type=Command Error FA
+Commands\46\String=\\xfa
 Commands\46\Min=0
 Commands\46\Max=0
 Commands\46\Command29=false
-Commands\47\Type=Vox Status
-Commands\47\String=\\x16\\x46
+Commands\47\Type=Command OK FB
+Commands\47\String=\\xfb
 Commands\47\Min=0
-Commands\47\Max=1
+Commands\47\Max=0
 Commands\47\Command29=false
 Commands\size=47
 Spans\size=0
@@ -267,21 +267,21 @@ Inputs\2\Reg=0
 Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=6
-Bands\1\BSR=11
+Bands\1\BSR=0
 Bands\1\Start=144000000
 Bands\1\End=148000000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=2m
 Bands\2\Num=7
-Bands\2\BSR=11
+Bands\2\BSR=0
 Bands\2\Start=108000000
 Bands\2\End=137000000
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=Air
 Bands\3\Num=10
-Bands\3\BSR=10
+Bands\3\BSR=0
 Bands\3\Start=50000000
 Bands\3\End=54000000
 Bands\3\Range=0
@@ -337,7 +337,7 @@ Bands\10\Range=0
 Bands\10\MemoryGroup=-1
 Bands\10\Name=40m
 Bands\11\Num=18
-Bands\11\BSR=11
+Bands\11\BSR=0
 Bands\11\Start=5250000
 Bands\11\End=5450000
 Bands\11\Range=0
@@ -358,21 +358,21 @@ Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=160m
 Bands\14\Num=21
-Bands\14\BSR=11
+Bands\14\BSR=0
 Bands\14\Start=493000
 Bands\14\End=595000
 Bands\14\Range=0
 Bands\14\MemoryGroup=-1
 Bands\14\Name=630m
 Bands\15\Num=22
-Bands\15\BSR=11
+Bands\15\BSR=0
 Bands\15\Start=135000
 Bands\15\End=138000
 Bands\15\Range=0
 Bands\15\MemoryGroup=-1
 Bands\15\Name=2200m
 Bands\16\Num=23
-Bands\16\BSR=11
+Bands\16\BSR=0
 Bands\16\Start=10000
 Bands\16\End=30000000
 Bands\16\Range=0
@@ -381,54 +381,46 @@ Bands\16\Name=Gen
 Bands\size=16
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=0
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=0
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\size=8
-Attenuators\1\dB=20
+Attenuators\1\dB=14
 Attenuators\size=1
 Preamps\1\Num=0
 Preamps\1\Name=OFF
diff --git a/rigs/IC-746PRO.rig b/rigs/IC-746PRO.rig
index 20ea7b6..24e8ad7 100644
--- a/rigs/IC-746PRO.rig
+++ b/rigs/IC-746PRO.rig
@@ -80,22 +80,22 @@ Commands\11\Command29=false
 Commands\12\Type=Memory Mode
 Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=101
+Commands\12\Max=65
 Commands\12\Command29=false
 Commands\13\Type=Memory Write
 Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=101
+Commands\13\Max=65
 Commands\13\Command29=false
 Commands\14\Type=Memory to VFO
 Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Clear
 Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Scanning
 Commands\16\String=\\x0e
@@ -105,7 +105,7 @@ Commands\16\Command29=false
 Commands\17\Type=Duplex Operation
 Commands\17\String=\\x0f
 Commands\17\Min=0
-Commands\17\Max=12
+Commands\17\Max=0
 Commands\17\Command29=false
 Commands\18\Type=Tuning Step
 Commands\18\String=\\x10
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Attenuator Status
 Commands\19\String=\\x11
 Commands\19\Min=0
-Commands\19\Max=20
+Commands\19\Max=14
 Commands\19\Command29=false
 Commands\20\Type=Antenna
 Commands\20\String=\\x12
@@ -125,32 +125,32 @@ Commands\20\Command29=false
 Commands\21\Type=PBT Inner
 Commands\21\String=\\x14\\x07
 Commands\21\Min=0
-Commands\21\Max=255
+Commands\21\Max=0
 Commands\21\Command29=false
 Commands\22\Type=PBT Outer
 Commands\22\String=\\x14\\x08
 Commands\22\Min=0
-Commands\22\Max=255
+Commands\22\Max=0
 Commands\22\Command29=false
 Commands\23\Type=CW Pitch
 Commands\23\String=\\x14\\x09
 Commands\23\Min=0
-Commands\23\Max=255
+Commands\23\Max=0
 Commands\23\Command29=false
 Commands\24\Type=RF Power
 Commands\24\String=\\x14\\x0a
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=Mic Gain
 Commands\25\String=\\x14\\x0b
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=Key Speed
 Commands\26\String=\\x14\\x0c
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=Squelch
 Commands\27\String=\\x15\\x01
@@ -230,7 +230,7 @@ Commands\41\Command29=false
 Commands\42\Type=Band Stacking Reg
 Commands\42\String=\\x1a\\x01
 Commands\42\Min=0
-Commands\42\Max=10
+Commands\42\Max=0
 Commands\42\Command29=false
 Commands\43\Type=IF Filter Width
 Commands\43\String=\\x1a\\x03
@@ -240,22 +240,22 @@ Commands\43\Command29=false
 Commands\44\Type=Monitor Gain
 Commands\44\String=\\x1a\\x05\\x077
 Commands\44\Min=0
-Commands\44\Max=255
+Commands\44\Max=0
 Commands\44\Command29=false
 Commands\45\Type=Tone Frequency
 Commands\45\String=\\x1b\\x00
 Commands\45\Min=0
-Commands\45\Max=9999
+Commands\45\Max=0
 Commands\45\Command29=false
 Commands\46\Type=TSQL Frequency
 Commands\46\String=\\x1b\\x01
 Commands\46\Min=0
-Commands\46\Max=9999
+Commands\46\Max=0
 Commands\46\Command29=false
 Commands\47\Type=DTCS Code/Polarity
 Commands\47\String=\\x1b\\x02
 Commands\47\Min=0
-Commands\47\Max=9999
+Commands\47\Max=0
 Commands\47\Command29=false
 Commands\48\Type=Transceiver Status
 Commands\48\String=\\x1c
@@ -282,21 +282,21 @@ Inputs\2\Reg=0
 Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=6
-Bands\1\BSR=11
+Bands\1\BSR=0
 Bands\1\Start=144000000
 Bands\1\End=148000000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=2m
 Bands\2\Num=7
-Bands\2\BSR=12
+Bands\2\BSR=0
 Bands\2\Start=108000000
 Bands\2\End=137000000
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=Air
 Bands\3\Num=10
-Bands\3\BSR=10
+Bands\3\BSR=0
 Bands\3\Start=50000000
 Bands\3\End=54000000
 Bands\3\Range=0
@@ -352,7 +352,7 @@ Bands\10\Range=0
 Bands\10\MemoryGroup=-1
 Bands\10\Name=40m
 Bands\11\Num=18
-Bands\11\BSR=12
+Bands\11\BSR=0
 Bands\11\Start=5250000
 Bands\11\End=5450000
 Bands\11\Range=0
@@ -373,21 +373,21 @@ Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=160m
 Bands\14\Num=21
-Bands\14\BSR=12
+Bands\14\BSR=0
 Bands\14\Start=493000
 Bands\14\End=595000
 Bands\14\Range=0
 Bands\14\MemoryGroup=-1
 Bands\14\Name=630m
 Bands\15\Num=22
-Bands\15\BSR=12
+Bands\15\BSR=0
 Bands\15\Start=135000
 Bands\15\End=138000
 Bands\15\Range=0
 Bands\15\MemoryGroup=-1
 Bands\15\Name=2200m
 Bands\16\Num=23
-Bands\16\BSR=12
+Bands\16\BSR=0
 Bands\16\Start=10000
 Bands\16\End=30000000
 Bands\16\Range=0
@@ -396,54 +396,46 @@ Bands\16\Name=Gen
 Bands\size=16
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=0
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=0
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\size=8
-Attenuators\1\dB=20
+Attenuators\1\dB=14
 Attenuators\size=1
 Preamps\1\Num=0
 Preamps\1\Name=OFF
diff --git a/rigs/IC-756.rig b/rigs/IC-756.rig
index 4f5df52..19a4506 100644
--- a/rigs/IC-756.rig
+++ b/rigs/IC-756.rig
@@ -75,22 +75,22 @@ Commands\10\Command29=false
 Commands\11\Type=Memory Mode
 Commands\11\String=\\x08
 Commands\11\Min=0
-Commands\11\Max=101
+Commands\11\Max=65
 Commands\11\Command29=false
 Commands\12\Type=Memory Write
 Commands\12\String=\\x09
 Commands\12\Min=0
-Commands\12\Max=101
+Commands\12\Max=65
 Commands\12\Command29=false
 Commands\13\Type=Memory to VFO
 Commands\13\String=\\x0a
 Commands\13\Min=0
-Commands\13\Max=101
+Commands\13\Max=65
 Commands\13\Command29=false
 Commands\14\Type=Memory Clear
 Commands\14\String=\\x0b
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Scanning
 Commands\15\String=\\x0e
@@ -100,7 +100,7 @@ Commands\15\Command29=false
 Commands\16\Type=Duplex Operation
 Commands\16\String=\\x0f
 Commands\16\Min=0
-Commands\16\Max=12
+Commands\16\Max=0
 Commands\16\Command29=false
 Commands\17\Type=Tuning Step
 Commands\17\String=\\x10
@@ -110,7 +110,7 @@ Commands\17\Command29=false
 Commands\18\Type=Attenuator Status
 Commands\18\String=\\x11
 Commands\18\Min=0
-Commands\18\Max=20
+Commands\18\Max=14
 Commands\18\Command29=false
 Commands\19\Type=Antenna
 Commands\19\String=\\x12
@@ -131,21 +131,21 @@ Commands\size=21
 Spans\size=0
 Inputs\size=0
 Bands\1\Num=6
-Bands\1\BSR=11
+Bands\1\BSR=0
 Bands\1\Start=144000000
 Bands\1\End=148000000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=2m
 Bands\2\Num=7
-Bands\2\BSR=11
+Bands\2\BSR=0
 Bands\2\Start=108000000
 Bands\2\End=137000000
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=Air
 Bands\3\Num=10
-Bands\3\BSR=10
+Bands\3\BSR=0
 Bands\3\Start=50000000
 Bands\3\End=54000000
 Bands\3\Range=0
@@ -201,7 +201,7 @@ Bands\10\Range=0
 Bands\10\MemoryGroup=-1
 Bands\10\Name=40m
 Bands\11\Num=18
-Bands\11\BSR=11
+Bands\11\BSR=0
 Bands\11\Start=5250000
 Bands\11\End=5450000
 Bands\11\Range=0
@@ -222,21 +222,21 @@ Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=160m
 Bands\14\Num=21
-Bands\14\BSR=11
+Bands\14\BSR=0
 Bands\14\Start=493000
 Bands\14\End=595000
 Bands\14\Range=0
 Bands\14\MemoryGroup=-1
 Bands\14\Name=630m
 Bands\15\Num=22
-Bands\15\BSR=11
+Bands\15\BSR=0
 Bands\15\Start=135000
 Bands\15\End=138000
 Bands\15\Range=0
 Bands\15\MemoryGroup=-1
 Bands\15\Name=2200m
 Bands\16\Num=23
-Bands\16\BSR=11
+Bands\16\BSR=0
 Bands\16\Start=10000
 Bands\16\End=30000000
 Bands\16\Range=0
@@ -245,44 +245,38 @@ Bands\16\Name=Gen
 Bands\size=16
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\size=6
 Attenuators\1\dB=6
-Attenuators\2\dB=18
-Attenuators\3\dB=24
+Attenuators\2\dB=12
+Attenuators\3\dB=18
 Attenuators\size=3
 Preamps\1\Num=0
 Preamps\1\Name=OFF
diff --git a/rigs/IC-756PRO.rig b/rigs/IC-756PRO.rig
index 2025976..8743d37 100644
--- a/rigs/IC-756PRO.rig
+++ b/rigs/IC-756PRO.rig
@@ -90,22 +90,22 @@ Commands\13\Command29=false
 Commands\14\Type=Memory Mode
 Commands\14\String=\\x08
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Write
 Commands\15\String=\\x09
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Memory to VFO
 Commands\16\String=\\x0a
 Commands\16\Min=0
-Commands\16\Max=101
+Commands\16\Max=65
 Commands\16\Command29=false
 Commands\17\Type=Memory Clear
 Commands\17\String=\\x0b
 Commands\17\Min=0
-Commands\17\Max=101
+Commands\17\Max=65
 Commands\17\Command29=false
 Commands\18\Type=Scanning
 Commands\18\String=\\x0e
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Duplex Operation
 Commands\19\String=\\x0f
 Commands\19\Min=0
-Commands\19\Max=12
+Commands\19\Max=0
 Commands\19\Command29=false
 Commands\20\Type=Tuning Step
 Commands\20\String=\\x10
@@ -125,7 +125,7 @@ Commands\20\Command29=false
 Commands\21\Type=Attenuator Status
 Commands\21\String=\\x11
 Commands\21\Min=0
-Commands\21\Max=20
+Commands\21\Max=14
 Commands\21\Command29=false
 Commands\22\Type=Antenna
 Commands\22\String=\\x12
@@ -140,67 +140,67 @@ Commands\23\Command29=false
 Commands\24\Type=AF Gain
 Commands\24\String=\\x14\\x01
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=RF Gain
 Commands\25\String=\\x14\\x02
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=Squelch
 Commands\26\String=\\x14\\x03
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=Noise Reduction
 Commands\27\String=\\x14\\x06
 Commands\27\Min=0
-Commands\27\Max=255
+Commands\27\Max=0
 Commands\27\Command29=false
 Commands\28\Type=PBT Inner
 Commands\28\String=\\x14\\x07
 Commands\28\Min=0
-Commands\28\Max=255
+Commands\28\Max=0
 Commands\28\Command29=false
 Commands\29\Type=PBT Outer
 Commands\29\String=\\x14\\x08
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
 Commands\30\Type=CW Pitch
 Commands\30\String=\\x14\\x09
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=0
 Commands\30\Command29=false
 Commands\31\Type=RF Power
 Commands\31\String=\\x14\\x0a
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
 Commands\32\Type=Mic Gain
 Commands\32\String=\\x14\\x0b
 Commands\32\Min=0
-Commands\32\Max=255
+Commands\32\Max=0
 Commands\32\Command29=false
 Commands\33\Type=Key Speed
 Commands\33\String=\\x14\\x0c
 Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Max=0
 Commands\33\Command29=false
 Commands\34\Type=Notch Filter
 Commands\34\String=\\x14\\x0d
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
 Commands\35\Type=Compressor Level
 Commands\35\String=\\x14\\x0e
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=0
 Commands\35\Command29=false
 Commands\36\Type=Break-In Delay
 Commands\36\String=\\x14\\x0f
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
 Commands\37\Type=Various Squelch
 Commands\37\String=\\x15\\x01
@@ -285,22 +285,22 @@ Commands\52\Command29=false
 Commands\53\Type=Band Stacking Reg
 Commands\53\String=\\x1a\\x01
 Commands\53\Min=0
-Commands\53\Max=10
+Commands\53\Max=0
 Commands\53\Command29=false
 Commands\54\Type=Tone Frequency
 Commands\54\String=\\x1b\\x00
 Commands\54\Min=0
-Commands\54\Max=9999
+Commands\54\Max=0
 Commands\54\Command29=false
 Commands\55\Type=TSQL Frequency
 Commands\55\String=\\x1b\\x01
 Commands\55\Min=0
-Commands\55\Max=9999
+Commands\55\Max=0
 Commands\55\Command29=false
 Commands\56\Type=DTCS Code/Polarity
 Commands\56\String=\\x1b\\x02
 Commands\56\Min=0
-Commands\56\Max=9999
+Commands\56\Max=0
 Commands\56\Command29=false
 Commands\57\Type=Transceiver Status
 Commands\57\String=\\x1c
@@ -327,21 +327,21 @@ Inputs\2\Reg=0
 Inputs\2\Name=ACC
 Inputs\size=2
 Bands\1\Num=6
-Bands\1\BSR=11
+Bands\1\BSR=0
 Bands\1\Start=144000000
 Bands\1\End=148000000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
 Bands\1\Name=2m
 Bands\2\Num=7
-Bands\2\BSR=12
+Bands\2\BSR=0
 Bands\2\Start=108000000
 Bands\2\End=137000000
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
 Bands\2\Name=Air
 Bands\3\Num=10
-Bands\3\BSR=10
+Bands\3\BSR=0
 Bands\3\Start=50000000
 Bands\3\End=54000000
 Bands\3\Range=0
@@ -397,7 +397,7 @@ Bands\10\Range=0
 Bands\10\MemoryGroup=-1
 Bands\10\Name=40m
 Bands\11\Num=18
-Bands\11\BSR=12
+Bands\11\BSR=0
 Bands\11\Start=5250000
 Bands\11\End=5450000
 Bands\11\Range=0
@@ -418,21 +418,21 @@ Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=160m
 Bands\14\Num=21
-Bands\14\BSR=12
+Bands\14\BSR=0
 Bands\14\Start=493000
 Bands\14\End=595000
 Bands\14\Range=0
 Bands\14\MemoryGroup=-1
 Bands\14\Name=630m
 Bands\15\Num=22
-Bands\15\BSR=12
+Bands\15\BSR=0
 Bands\15\Start=135000
 Bands\15\End=138000
 Bands\15\Range=0
 Bands\15\MemoryGroup=-1
 Bands\15\Name=2200m
 Bands\16\Num=23
-Bands\16\BSR=12
+Bands\16\BSR=0
 Bands\16\Start=10000
 Bands\16\End=30000000
 Bands\16\Range=0
@@ -441,56 +441,48 @@ Bands\16\Name=Gen
 Bands\size=16
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=0
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=0
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\size=8
 Attenuators\1\dB=6
-Attenuators\2\dB=18
-Attenuators\3\dB=24
+Attenuators\2\dB=12
+Attenuators\3\dB=18
 Attenuators\size=3
 Preamps\1\Num=0
 Preamps\1\Name=OFF
diff --git a/rigs/IC-756PROII.rig b/rigs/IC-756PROII.rig
index bc39a25..918c394 100644
--- a/rigs/IC-756PROII.rig
+++ b/rigs/IC-756PROII.rig
@@ -90,22 +90,22 @@ Commands\13\Command29=false
 Commands\14\Type=Memory Mode
 Commands\14\String=\\x08
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Write
 Commands\15\String=\\x09
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Memory to VFO
 Commands\16\String=\\x0a
 Commands\16\Min=0
-Commands\16\Max=101
+Commands\16\Max=65
 Commands\16\Command29=false
 Commands\17\Type=Memory Clear
 Commands\17\String=\\x0b
 Commands\17\Min=0
-Commands\17\Max=101
+Commands\17\Max=65
 Commands\17\Command29=false
 Commands\18\Type=Scanning
 Commands\18\String=\\x0e
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Duplex Operation
 Commands\19\String=\\x0f
 Commands\19\Min=0
-Commands\19\Max=12
+Commands\19\Max=0
 Commands\19\Command29=false
 Commands\20\Type=Tuning Step
 Commands\20\String=\\x10
@@ -125,7 +125,7 @@ Commands\20\Command29=false
 Commands\21\Type=Attenuator Status
 Commands\21\String=\\x11
 Commands\21\Min=0
-Commands\21\Max=20
+Commands\21\Max=14
 Commands\21\Command29=false
 Commands\22\Type=Antenna
 Commands\22\String=\\x12
@@ -140,67 +140,67 @@ Commands\23\Command29=false
 Commands\24\Type=AF Gain
 Commands\24\String=\\x14\\x01
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=RF Gain
 Commands\25\String=\\x14\\x02
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=Squelch
 Commands\26\String=\\x14\\x03
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=Noise Reduction
 Commands\27\String=\\x14\\x06
 Commands\27\Min=0
-Commands\27\Max=255
+Commands\27\Max=0
 Commands\27\Command29=false
 Commands\28\Type=PBT Inner
 Commands\28\String=\\x14\\x07
 Commands\28\Min=0
-Commands\28\Max=255
+Commands\28\Max=0
 Commands\28\Command29=false
 Commands\29\Type=PBT Outer
 Commands\29\String=\\x14\\x08
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
 Commands\30\Type=CW Pitch
 Commands\30\String=\\x14\\x09
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=0
 Commands\30\Command29=false
 Commands\31\Type=RF Power
 Commands\31\String=\\x14\\x0a
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
 Commands\32\Type=Mic Gain
 Commands\32\String=\\x14\\x0b
 Commands\32\Min=0
-Commands\32\Max=255
+Commands\32\Max=0
 Commands\32\Command29=false
 Commands\33\Type=Key Speed
 Commands\33\String=\\x14\\x0c
 Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Max=0
 Commands\33\Command29=false
 Commands\34\Type=Notch Filter
 Commands\34\String=\\x14\\x0d
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
 Commands\35\Type=Compressor Level
 Commands\35\String=\\x14\\x0e
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=0
 Commands\35\Command29=false
 Commands\36\Type=Break-In Delay
 Commands\36\String=\\x14\\x0f
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
 Commands\37\Type=Various Squelch
 Commands\37\String=\\x15\\x01
@@ -285,17 +285,17 @@ Commands\52\Command29=false
 Commands\53\Type=Band Stacking Reg
 Commands\53\String=\\x1a\\x01
 Commands\53\Min=0
-Commands\53\Max=10
+Commands\53\Max=0
 Commands\53\Command29=false
 Commands\54\Type=Tone Frequency
 Commands\54\String=\\x1b\\x00
 Commands\54\Min=0
-Commands\54\Max=9999
+Commands\54\Max=0
 Commands\54\Command29=false
 Commands\55\Type=TSQL Frequency
 Commands\55\String=\\x1b\\x01
 Commands\55\Min=0
-Commands\55\Max=9999
+Commands\55\Max=0
 Commands\55\Command29=false
 Commands\56\Type=Transceiver Status
 Commands\56\String=\\x1c
@@ -321,41 +321,41 @@ Inputs\2\Num=1
 Inputs\2\Reg=0
 Inputs\2\Name=ACC
 Inputs\size=2
-Bands\1\Num=20
-Bands\1\BSR=1
-Bands\1\Start=1800000
-Bands\1\End=2000000
+Bands\1\Num=7
+Bands\1\BSR=0
+Bands\1\Start=108000000
+Bands\1\End=137000000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
-Bands\1\Name=160m
-Bands\2\Num=19
-Bands\2\BSR=2
-Bands\2\Start=3500000
-Bands\2\End=4000000
+Bands\1\Name=Air
+Bands\2\Num=10
+Bands\2\BSR=0
+Bands\2\Start=50000000
+Bands\2\End=54000000
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
-Bands\2\Name=80m
-Bands\3\Num=17
-Bands\3\BSR=3
-Bands\3\Start=7000000
-Bands\3\End=7300000
+Bands\2\Name=6m
+Bands\3\Num=11
+Bands\3\BSR=9
+Bands\3\Start=28000000
+Bands\3\End=29700000
 Bands\3\Range=0
 Bands\3\MemoryGroup=-1
-Bands\3\Name=40m
-Bands\4\Num=16
-Bands\4\BSR=4
-Bands\4\Start=10100000
-Bands\4\End=10150000
+Bands\3\Name=10m
+Bands\4\Num=12
+Bands\4\BSR=8
+Bands\4\Start=24890000
+Bands\4\End=24990000
 Bands\4\Range=0
 Bands\4\MemoryGroup=-1
-Bands\4\Name=30m
-Bands\5\Num=15
-Bands\5\BSR=5
-Bands\5\Start=14000000
-Bands\5\End=14350000
+Bands\4\Name=12m
+Bands\5\Num=13
+Bands\5\BSR=7
+Bands\5\Start=21000000
+Bands\5\End=21450000
 Bands\5\Range=0
 Bands\5\MemoryGroup=-1
-Bands\5\Name=20m
+Bands\5\Name=15m
 Bands\6\Num=14
 Bands\6\BSR=6
 Bands\6\Start=18068000
@@ -363,64 +363,64 @@ Bands\6\End=18168000
 Bands\6\Range=0
 Bands\6\MemoryGroup=-1
 Bands\6\Name=17m
-Bands\7\Num=13
-Bands\7\BSR=7
-Bands\7\Start=21000000
-Bands\7\End=21450000
+Bands\7\Num=15
+Bands\7\BSR=5
+Bands\7\Start=14000000
+Bands\7\End=14350000
 Bands\7\Range=0
 Bands\7\MemoryGroup=-1
-Bands\7\Name=15m
-Bands\8\Num=12
-Bands\8\BSR=8
-Bands\8\Start=24890000
-Bands\8\End=24990000
+Bands\7\Name=20m
+Bands\8\Num=16
+Bands\8\BSR=4
+Bands\8\Start=10100000
+Bands\8\End=10150000
 Bands\8\Range=0
 Bands\8\MemoryGroup=-1
-Bands\8\Name=12m
-Bands\9\Num=11
-Bands\9\BSR=9
-Bands\9\Start=28000000
-Bands\9\End=29700000
+Bands\8\Name=30m
+Bands\9\Num=17
+Bands\9\BSR=3
+Bands\9\Start=7000000
+Bands\9\End=7300000
 Bands\9\Range=0
 Bands\9\MemoryGroup=-1
-Bands\9\Name=10m
-Bands\10\Num=10
-Bands\10\BSR=10
-Bands\10\Start=50000000
-Bands\10\End=54000000
+Bands\9\Name=40m
+Bands\10\Num=18
+Bands\10\BSR=0
+Bands\10\Start=5250000
+Bands\10\End=5450000
 Bands\10\Range=0
 Bands\10\MemoryGroup=-1
-Bands\10\Name=6m
-Bands\11\Num=7
-Bands\11\BSR=12
-Bands\11\Start=108000000
-Bands\11\End=137000000
+Bands\10\Name=60m
+Bands\11\Num=19
+Bands\11\BSR=2
+Bands\11\Start=3500000
+Bands\11\End=4000000
 Bands\11\Range=0
 Bands\11\MemoryGroup=-1
-Bands\11\Name=Air
-Bands\12\Num=18
-Bands\12\BSR=12
-Bands\12\Start=5250000
-Bands\12\End=5450000
+Bands\11\Name=80m
+Bands\12\Num=20
+Bands\12\BSR=1
+Bands\12\Start=1800000
+Bands\12\End=2000000
 Bands\12\Range=0
 Bands\12\MemoryGroup=-1
-Bands\12\Name=60m
+Bands\12\Name=160m
 Bands\13\Num=21
-Bands\13\BSR=12
+Bands\13\BSR=0
 Bands\13\Start=493000
 Bands\13\End=595000
 Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=630m
 Bands\14\Num=22
-Bands\14\BSR=12
+Bands\14\BSR=0
 Bands\14\Start=135000
 Bands\14\End=138000
 Bands\14\Range=0
 Bands\14\MemoryGroup=-1
 Bands\14\Name=2200m
 Bands\15\Num=23
-Bands\15\BSR=12
+Bands\15\BSR=0
 Bands\15\Start=10000
 Bands\15\End=30000000
 Bands\15\Range=0
@@ -429,56 +429,48 @@ Bands\15\Name=Gen
 Bands\size=15
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=0
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=0
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\size=8
 Attenuators\1\dB=6
-Attenuators\2\dB=18
-Attenuators\3\dB=24
+Attenuators\2\dB=12
+Attenuators\3\dB=18
 Attenuators\size=3
 Preamps\1\Num=0
 Preamps\1\Name=OFF
diff --git a/rigs/IC-756PROIII.rig b/rigs/IC-756PROIII.rig
index 01ac89e..3e7a863 100644
--- a/rigs/IC-756PROIII.rig
+++ b/rigs/IC-756PROIII.rig
@@ -90,22 +90,22 @@ Commands\13\Command29=false
 Commands\14\Type=Memory Mode
 Commands\14\String=\\x08
 Commands\14\Min=0
-Commands\14\Max=101
+Commands\14\Max=65
 Commands\14\Command29=false
 Commands\15\Type=Memory Write
 Commands\15\String=\\x09
 Commands\15\Min=0
-Commands\15\Max=101
+Commands\15\Max=65
 Commands\15\Command29=false
 Commands\16\Type=Memory to VFO
 Commands\16\String=\\x0a
 Commands\16\Min=0
-Commands\16\Max=101
+Commands\16\Max=65
 Commands\16\Command29=false
 Commands\17\Type=Memory Clear
 Commands\17\String=\\x0b
 Commands\17\Min=0
-Commands\17\Max=101
+Commands\17\Max=65
 Commands\17\Command29=false
 Commands\18\Type=Scanning
 Commands\18\String=\\x0e
@@ -115,7 +115,7 @@ Commands\18\Command29=false
 Commands\19\Type=Duplex Operation
 Commands\19\String=\\x0f
 Commands\19\Min=0
-Commands\19\Max=12
+Commands\19\Max=0
 Commands\19\Command29=false
 Commands\20\Type=Tuning Step
 Commands\20\String=\\x10
@@ -125,7 +125,7 @@ Commands\20\Command29=false
 Commands\21\Type=Attenuator Status
 Commands\21\String=\\x11
 Commands\21\Min=0
-Commands\21\Max=20
+Commands\21\Max=14
 Commands\21\Command29=false
 Commands\22\Type=Antenna
 Commands\22\String=\\x12
@@ -140,67 +140,67 @@ Commands\23\Command29=false
 Commands\24\Type=AF Gain
 Commands\24\String=\\x14\\x01
 Commands\24\Min=0
-Commands\24\Max=255
+Commands\24\Max=0
 Commands\24\Command29=false
 Commands\25\Type=RF Gain
 Commands\25\String=\\x14\\x02
 Commands\25\Min=0
-Commands\25\Max=255
+Commands\25\Max=0
 Commands\25\Command29=false
 Commands\26\Type=Squelch
 Commands\26\String=\\x14\\x03
 Commands\26\Min=0
-Commands\26\Max=255
+Commands\26\Max=0
 Commands\26\Command29=false
 Commands\27\Type=Noise Reduction
 Commands\27\String=\\x14\\x06
 Commands\27\Min=0
-Commands\27\Max=255
+Commands\27\Max=0
 Commands\27\Command29=false
 Commands\28\Type=PBT Inner
 Commands\28\String=\\x14\\x07
 Commands\28\Min=0
-Commands\28\Max=255
+Commands\28\Max=0
 Commands\28\Command29=false
 Commands\29\Type=PBT Outer
 Commands\29\String=\\x14\\x08
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
 Commands\30\Type=CW Pitch
 Commands\30\String=\\x14\\x09
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=0
 Commands\30\Command29=false
 Commands\31\Type=RF Power
 Commands\31\String=\\x14\\x0a
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
 Commands\32\Type=Mic Gain
 Commands\32\String=\\x14\\x0b
 Commands\32\Min=0
-Commands\32\Max=255
+Commands\32\Max=0
 Commands\32\Command29=false
 Commands\33\Type=Key Speed
 Commands\33\String=\\x14\\x0c
 Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Max=0
 Commands\33\Command29=false
 Commands\34\Type=Notch Filter
 Commands\34\String=\\x14\\x0d
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
 Commands\35\Type=Compressor Level
 Commands\35\String=\\x14\\x0e
 Commands\35\Min=0
-Commands\35\Max=255
+Commands\35\Max=0
 Commands\35\Command29=false
 Commands\36\Type=Break-In Delay
 Commands\36\String=\\x14\\x0f
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
 Commands\37\Type=Various Squelch
 Commands\37\String=\\x15\\x01
@@ -285,17 +285,17 @@ Commands\52\Command29=false
 Commands\53\Type=Band Stacking Reg
 Commands\53\String=\\x1a\\x01
 Commands\53\Min=0
-Commands\53\Max=10
+Commands\53\Max=0
 Commands\53\Command29=false
 Commands\54\Type=Tone Frequency
 Commands\54\String=\\x1b\\x00
 Commands\54\Min=0
-Commands\54\Max=9999
+Commands\54\Max=0
 Commands\54\Command29=false
 Commands\55\Type=TSQL Frequency
 Commands\55\String=\\x1b\\x01
 Commands\55\Min=0
-Commands\55\Max=9999
+Commands\55\Max=0
 Commands\55\Command29=false
 Commands\56\Type=Transceiver Status
 Commands\56\String=\\x1c
@@ -321,41 +321,41 @@ Inputs\2\Num=1
 Inputs\2\Reg=0
 Inputs\2\Name=ACC
 Inputs\size=2
-Bands\1\Num=20
-Bands\1\BSR=1
-Bands\1\Start=1800000
-Bands\1\End=2000000
+Bands\1\Num=7
+Bands\1\BSR=0
+Bands\1\Start=108000000
+Bands\1\End=137000000
 Bands\1\Range=0
 Bands\1\MemoryGroup=-1
-Bands\1\Name=160m
-Bands\2\Num=19
-Bands\2\BSR=2
-Bands\2\Start=3500000
-Bands\2\End=4000000
+Bands\1\Name=Air
+Bands\2\Num=10
+Bands\2\BSR=0
+Bands\2\Start=50000000
+Bands\2\End=54000000
 Bands\2\Range=0
 Bands\2\MemoryGroup=-1
-Bands\2\Name=80m
-Bands\3\Num=17
-Bands\3\BSR=3
-Bands\3\Start=7000000
-Bands\3\End=7300000
+Bands\2\Name=6m
+Bands\3\Num=11
+Bands\3\BSR=9
+Bands\3\Start=28000000
+Bands\3\End=29700000
 Bands\3\Range=0
 Bands\3\MemoryGroup=-1
-Bands\3\Name=40m
-Bands\4\Num=16
-Bands\4\BSR=4
-Bands\4\Start=10100000
-Bands\4\End=10150000
+Bands\3\Name=10m
+Bands\4\Num=12
+Bands\4\BSR=8
+Bands\4\Start=24890000
+Bands\4\End=24990000
 Bands\4\Range=0
 Bands\4\MemoryGroup=-1
-Bands\4\Name=30m
-Bands\5\Num=15
-Bands\5\BSR=5
-Bands\5\Start=14000000
-Bands\5\End=14350000
+Bands\4\Name=12m
+Bands\5\Num=13
+Bands\5\BSR=7
+Bands\5\Start=21000000
+Bands\5\End=21450000
 Bands\5\Range=0
 Bands\5\MemoryGroup=-1
-Bands\5\Name=20m
+Bands\5\Name=15m
 Bands\6\Num=14
 Bands\6\BSR=6
 Bands\6\Start=18068000
@@ -363,64 +363,64 @@ Bands\6\End=18168000
 Bands\6\Range=0
 Bands\6\MemoryGroup=-1
 Bands\6\Name=17m
-Bands\7\Num=13
-Bands\7\BSR=7
-Bands\7\Start=21000000
-Bands\7\End=21450000
+Bands\7\Num=15
+Bands\7\BSR=5
+Bands\7\Start=14000000
+Bands\7\End=14350000
 Bands\7\Range=0
 Bands\7\MemoryGroup=-1
-Bands\7\Name=15m
-Bands\8\Num=12
-Bands\8\BSR=8
-Bands\8\Start=24890000
-Bands\8\End=24990000
+Bands\7\Name=20m
+Bands\8\Num=16
+Bands\8\BSR=4
+Bands\8\Start=10100000
+Bands\8\End=10150000
 Bands\8\Range=0
 Bands\8\MemoryGroup=-1
-Bands\8\Name=12m
-Bands\9\Num=11
-Bands\9\BSR=9
-Bands\9\Start=28000000
-Bands\9\End=29700000
+Bands\8\Name=30m
+Bands\9\Num=17
+Bands\9\BSR=3
+Bands\9\Start=7000000
+Bands\9\End=7300000
 Bands\9\Range=0
 Bands\9\MemoryGroup=-1
-Bands\9\Name=10m
-Bands\10\Num=10
-Bands\10\BSR=10
-Bands\10\Start=50000000
-Bands\10\End=54000000
+Bands\9\Name=40m
+Bands\10\Num=18
+Bands\10\BSR=0
+Bands\10\Start=5250000
+Bands\10\End=5450000
 Bands\10\Range=0
 Bands\10\MemoryGroup=-1
-Bands\10\Name=6m
-Bands\11\Num=7
-Bands\11\BSR=12
-Bands\11\Start=108000000
-Bands\11\End=137000000
+Bands\10\Name=60m
+Bands\11\Num=19
+Bands\11\BSR=2
+Bands\11\Start=3500000
+Bands\11\End=4000000
 Bands\11\Range=0
 Bands\11\MemoryGroup=-1
-Bands\11\Name=Air
-Bands\12\Num=18
-Bands\12\BSR=12
-Bands\12\Start=5250000
-Bands\12\End=5450000
+Bands\11\Name=80m
+Bands\12\Num=20
+Bands\12\BSR=1
+Bands\12\Start=1800000
+Bands\12\End=2000000
 Bands\12\Range=0
 Bands\12\MemoryGroup=-1
-Bands\12\Name=60m
+Bands\12\Name=160m
 Bands\13\Num=21
-Bands\13\BSR=12
+Bands\13\BSR=0
 Bands\13\Start=493000
 Bands\13\End=595000
 Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=630m
 Bands\14\Num=22
-Bands\14\BSR=12
+Bands\14\BSR=0
 Bands\14\Start=135000
 Bands\14\End=138000
 Bands\14\Range=0
 Bands\14\MemoryGroup=-1
 Bands\14\Name=2200m
 Bands\15\Num=23
-Bands\15\BSR=12
+Bands\15\BSR=0
 Bands\15\Start=10000
 Bands\15\End=30000000
 Bands\15\Range=0
@@ -429,56 +429,48 @@ Bands\15\Name=Gen
 Bands\size=15
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=0
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=0
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=0
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=0
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=0
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=0
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=0
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\size=8
 Attenuators\1\dB=6
-Attenuators\2\dB=18
-Attenuators\3\dB=24
+Attenuators\2\dB=12
+Attenuators\3\dB=18
 Attenuators\size=3
 Preamps\1\Num=0
 Preamps\1\Name=OFF
diff --git a/rigs/IC-7610.rig b/rigs/IC-7610.rig
index 27f8042..1ef4bd1 100644
--- a/rigs/IC-7610.rig
+++ b/rigs/IC-7610.rig
@@ -100,27 +100,27 @@ Commands\15\Command29=false
 Commands\16\Type=Memory Mode
 Commands\16\String=\\x08
 Commands\16\Min=1
-Commands\16\Max=101
+Commands\16\Max=99
 Commands\16\Command29=false
 Commands\17\Type=Memory Write
 Commands\17\String=\\x09
 Commands\17\Min=1
-Commands\17\Max=101
+Commands\17\Max=99
 Commands\17\Command29=false
 Commands\18\Type=Memory to VFO
 Commands\18\String=\\x0a
 Commands\18\Min=1
-Commands\18\Max=101
+Commands\18\Max=99
 Commands\18\Command29=false
 Commands\19\Type=Memory Clear
 Commands\19\String=\\x0b
 Commands\19\Min=1
-Commands\19\Max=101
+Commands\19\Max=99
 Commands\19\Command29=false
 Commands\20\Type=Scanning
 Commands\20\String=\\x0e
 Commands\20\Min=0
-Commands\20\Max=255
+Commands\20\Max=0
 Commands\20\Command29=false
 Commands\21\Type=Split/Duplex
 Commands\21\String=\\x0f
@@ -135,7 +135,7 @@ Commands\22\Command29=false
 Commands\23\Type=Attenuator Status
 Commands\23\String=\\x11
 Commands\23\Min=0
-Commands\23\Max=69
+Commands\23\Max=45
 Commands\23\Command29=true
 Commands\24\Type=Antenna
 Commands\24\String=\\x12
@@ -184,8 +184,8 @@ Commands\32\Max=255
 Commands\32\Command29=true
 Commands\33\Type=CW Pitch
 Commands\33\String=\\x14\\x09
-Commands\33\Min=0
-Commands\33\Max=255
+Commands\33\Min=300
+Commands\33\Max=900
 Commands\33\Command29=false
 Commands\34\Type=RF Power
 Commands\34\String=\\x14\\x0a
@@ -199,8 +199,8 @@ Commands\35\Max=255
 Commands\35\Command29=false
 Commands\36\Type=Key Speed
 Commands\36\String=\\x14\\x0c
-Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Min=6
+Commands\36\Max=48
 Commands\36\Command29=false
 Commands\37\Type=Compressor Level
 Commands\37\String=\\x14\\x0e
@@ -245,7 +245,7 @@ Commands\44\Command29=false
 Commands\45\Type=S Meter Sql Status
 Commands\45\String=\\x15\\x01
 Commands\45\Min=0
-Commands\45\Max=255
+Commands\45\Max=1
 Commands\45\Command29=true
 Commands\46\Type=S Meter
 Commands\46\String=\\x15\\x02
@@ -255,7 +255,7 @@ Commands\46\Command29=true
 Commands\47\Type=Various Squelch
 Commands\47\String=\\x15\\x05
 Commands\47\Min=0
-Commands\47\Max=255
+Commands\47\Max=1
 Commands\47\Command29=true
 Commands\48\Type=Overflow Status
 Commands\48\String=\\x15\\x07
@@ -400,7 +400,7 @@ Commands\75\Command29=true
 Commands\76\Type=Send CW
 Commands\76\String=\\x17
 Commands\76\Min=0
-Commands\76\Max=30
+Commands\76\Max=0
 Commands\76\Command29=false
 Commands\77\Type=Power Control
 Commands\77\String=\\x18
@@ -415,17 +415,17 @@ Commands\78\Command29=false
 Commands\79\Type=Memory Contents
 Commands\79\String=\\x1a\\00
 Commands\79\Min=1
-Commands\79\Max=101
+Commands\79\Max=99
 Commands\79\Command29=false
 Commands\80\Type=Band Stacking Reg
 Commands\80\String=\\x1a\\x01
 Commands\80\Min=1
-Commands\80\Max=11
+Commands\80\Max=0
 Commands\80\Command29=false
 Commands\81\Type=Filter Width
 Commands\81\String=\\x1a\\x03
 Commands\81\Min=0
-Commands\81\Max=10000
+Commands\81\Max=3600
 Commands\81\Command29=true
 Commands\82\Type=Quick Dual Watch
 Commands\82\String=\\x1a\\x05\\x00\\x32
@@ -438,286 +438,281 @@ Commands\83\Min=0
 Commands\83\Max=1
 Commands\83\Command29=false
 Commands\84\Type=REF Adjust
-Commands\84\String=\\x1a\\x05\\x00\\x72
+Commands\84\String=\\x1a\\x05\\x00\\x70
 Commands\84\Min=0
-Commands\84\Max=255
+Commands\84\Max=511
 Commands\84\Command29=false
-Commands\85\Type=REF Adjust Fine
-Commands\85\String=\\x1A\\x05\\x00\\x73
+Commands\85\Type=ACC1 Mod Level
+Commands\85\String=\\x1A\\x05\\x00\\x88
 Commands\85\Min=0
 Commands\85\Max=255
 Commands\85\Command29=false
-Commands\86\Type=ACC1 Mod Level
-Commands\86\String=\\x1A\\x05\\x00\\x88
+Commands\86\Type=USB Mod Level
+Commands\86\String=\\x1a\\x05\\x00\\x89
 Commands\86\Min=0
 Commands\86\Max=255
 Commands\86\Command29=false
-Commands\87\Type=USB Mod Level
-Commands\87\String=\\x1a\\x05\\x00\\x89
+Commands\87\Type=LAN Mod Level
+Commands\87\String=\\x1a\\x05\\x00\\x90
 Commands\87\Min=0
 Commands\87\Max=255
 Commands\87\Command29=false
-Commands\88\Type=LAN Mod Level
-Commands\88\String=\\x1a\\x05\\x00\\x90
+Commands\88\Type=Data Off Mod Input
+Commands\88\String=\\x1a\\x05\\x00\\x91
 Commands\88\Min=0
-Commands\88\Max=255
+Commands\88\Max=5
 Commands\88\Command29=false
-Commands\89\Type=Data Off Mod Input
-Commands\89\String=\\x1a\\x05\\x00\\x91
+Commands\89\Type=DATA1 Mod Input
+Commands\89\String=\\x1a\\x05\\x00\\x92
 Commands\89\Min=0
 Commands\89\Max=5
 Commands\89\Command29=false
-Commands\90\Type=DATA1 Mod Input
-Commands\90\String=\\x1a\\x05\\x00\\x92
+Commands\90\Type=DATA2 Mod Input
+Commands\90\String=\\x1a\\x05\\x00\\x93
 Commands\90\Min=0
 Commands\90\Max=5
 Commands\90\Command29=false
-Commands\91\Type=DATA2 Mod Input
-Commands\91\String=\\x1a\\x05\\x00\\x93
+Commands\91\Type=DATA3 Mod Input
+Commands\91\String=\\x1a\\x05\\x00\\x94
 Commands\91\Min=0
 Commands\91\Max=5
 Commands\91\Command29=false
-Commands\92\Type=DATA3 Mod Input
-Commands\92\String=\\x1a\\x05\\x00\\x94
+Commands\92\Type=CIV Transceive
+Commands\92\String=\\x1a\\x05\\x01\\x12
 Commands\92\Min=0
-Commands\92\Max=5
+Commands\92\Max=1
 Commands\92\Command29=false
-Commands\93\Type=CIV Transceive
-Commands\93\String=\\x1a\\x05\\x01\\x12
+Commands\93\Type=System Date
+Commands\93\String=\\x1a\\x05\\x01\\x58
 Commands\93\Min=0
-Commands\93\Max=1
+Commands\93\Max=0
 Commands\93\Command29=false
-Commands\94\Type=System Date
-Commands\94\String=\\x1a\\x05\\x01\\x58
+Commands\94\Type=System Time
+Commands\94\String=\\x1a\\x05\\x01\\x59
 Commands\94\Min=0
 Commands\94\Max=0
 Commands\94\Command29=false
-Commands\95\Type=System Time
-Commands\95\String=\\x1a\\x05\\x01\\x59
+Commands\95\Type=UTC Offset
+Commands\95\String=\\x1a\\x05\\x01\\x62
 Commands\95\Min=0
 Commands\95\Max=0
 Commands\95\Command29=false
-Commands\96\Type=UTC Offset
-Commands\96\String=\\x1a\\x05\\x01\\x62
-Commands\96\Min=0
-Commands\96\Max=0
+Commands\96\Type=Dash Ratio
+Commands\96\String=\\x1a\\x05\\x02\\x28
+Commands\96\Min=28
+Commands\96\Max=45
 Commands\96\Command29=false
-Commands\97\Type=Dash Ratio
-Commands\97\String=\\x1a\\x05\\x02\\x28
-Commands\97\Min=28
-Commands\97\Max=45
+Commands\97\Type=Data Mode Filter
+Commands\97\String=\\x1a\\x06
+Commands\97\Min=0
+Commands\97\Max=0
 Commands\97\Command29=false
-Commands\98\Type=Data Mode Filter
-Commands\98\String=\\x1a\\x06
+Commands\98\Type=AF Mute Status
+Commands\98\String=\\x1a\\x09
 Commands\98\Min=0
-Commands\98\Max=65535
-Commands\98\Command29=false
-Commands\99\Type=AF Mute Status
-Commands\99\String=\\x1a\\x09
+Commands\98\Max=1
+Commands\98\Command29=true
+Commands\99\Type=Transceiver Status
+Commands\99\String=\\x1c\\x00
 Commands\99\Min=0
 Commands\99\Max=1
-Commands\99\Command29=true
-Commands\100\Type=Transceiver Status
-Commands\100\String=\\x1c\\x00
+Commands\99\Command29=false
+Commands\100\Type=Tuner/ATU Status
+Commands\100\String=\\x1c\\x01
 Commands\100\Min=0
-Commands\100\Max=1
+Commands\100\Max=2
 Commands\100\Command29=false
-Commands\101\Type=Tuner/ATU Status
-Commands\101\String=\\x1c\\x01
+Commands\101\Type=XFC Status
+Commands\101\String=\\x1c\\x02
 Commands\101\Min=0
-Commands\101\Max=2
+Commands\101\Max=1
 Commands\101\Command29=false
-Commands\102\Type=XFC Status
-Commands\102\String=\\x1c\\x02
+Commands\102\Type=Read TX Freq
+Commands\102\String=\\x1c\\x03
 Commands\102\Min=0
 Commands\102\Max=1
 Commands\102\Command29=false
-Commands\103\Type=Read TX Freq
-Commands\103\String=\\x1c\\x03
+Commands\103\Type=CI-V Output
+Commands\103\String=\\x1c\\x04
 Commands\103\Min=0
 Commands\103\Max=1
 Commands\103\Command29=false
-Commands\104\Type=CI-V Output
-Commands\104\String=\\x1c\\x04
+Commands\104\Type=RIT Frequency
+Commands\104\String=\\x21\\x00
 Commands\104\Min=0
-Commands\104\Max=1
+Commands\104\Max=0
 Commands\104\Command29=false
-Commands\105\Type=RIT Frequency
-Commands\105\String=\\x21\\x00
-Commands\105\Min=-9999
-Commands\105\Max=9999
+Commands\105\Type=RIT Status
+Commands\105\String=\\x21\\x01
+Commands\105\Min=0
+Commands\105\Max=1
 Commands\105\Command29=false
-Commands\106\Type=RIT Status
-Commands\106\String=\\x21\\x01
+Commands\106\Type=RIT TX Status
+Commands\106\String=\\x21\\x02
 Commands\106\Min=0
 Commands\106\Max=1
 Commands\106\Command29=false
-Commands\107\Type=RIT TX Status
-Commands\107\String=\\x21\\x02
+Commands\107\Type=Selected Freq
+Commands\107\String=\\x25\\x00
 Commands\107\Min=0
-Commands\107\Max=1
+Commands\107\Max=0
 Commands\107\Command29=false
-Commands\108\Type=Selected Freq
-Commands\108\String=\\x25\\x00
+Commands\108\Type=Unselected Freq
+Commands\108\String=\\x25\\x01
 Commands\108\Min=0
 Commands\108\Max=0
 Commands\108\Command29=false
-Commands\109\Type=Unselected Freq
-Commands\109\String=\\x25\\x01
+Commands\109\Type=Selected Mode
+Commands\109\String=\\x26\\x00
 Commands\109\Min=0
 Commands\109\Max=0
 Commands\109\Command29=false
-Commands\110\Type=Selected Mode
-Commands\110\String=\\x26\\x00
+Commands\110\Type=Unselected Mode
+Commands\110\String=\\x26\\x01
 Commands\110\Min=0
 Commands\110\Max=0
 Commands\110\Command29=false
-Commands\111\Type=Unselected Mode
-Commands\111\String=\\x26\\x01
+Commands\111\Type=Scope Main Wave Data
+Commands\111\String=\\x27\\x00\\x00
 Commands\111\Min=0
 Commands\111\Max=0
 Commands\111\Command29=false
-Commands\112\Type=Scope Main Wave Data
-Commands\112\String=\\x27\\x00\\x00
+Commands\112\Type=Scope Sub Wave Data
+Commands\112\String=\\x27\\x00\\x01
 Commands\112\Min=0
 Commands\112\Max=0
 Commands\112\Command29=false
-Commands\113\Type=Scope Sub Wave Data
-Commands\113\String=\\x27\\x00\\x01
+Commands\113\Type=Scope On/Off
+Commands\113\String=\\x27\\x10
 Commands\113\Min=0
-Commands\113\Max=0
+Commands\113\Max=1
 Commands\113\Command29=false
-Commands\114\Type=Scope On/Off
-Commands\114\String=\\x27\\x10
+Commands\114\Type=Scope Data Output
+Commands\114\String=\\x27\\x11
 Commands\114\Min=0
 Commands\114\Max=1
 Commands\114\Command29=false
-Commands\115\Type=Scope Data Output
-Commands\115\String=\\x27\\x11
+Commands\115\Type=Scope Main/Sub
+Commands\115\String=\\x27\\x12
 Commands\115\Min=0
 Commands\115\Max=1
 Commands\115\Command29=false
-Commands\116\Type=Scope Main/Sub
-Commands\116\String=\\x27\\x12
+Commands\116\Type=Scope Single/Dual
+Commands\116\String=\\x27\\x13
 Commands\116\Min=0
 Commands\116\Max=1
 Commands\116\Command29=false
-Commands\117\Type=Scope Single/Dual
-Commands\117\String=\\x27\\x13
+Commands\117\Type=Scope Main Mode
+Commands\117\String=\\x27\\x14\\x00
 Commands\117\Min=0
-Commands\117\Max=1
+Commands\117\Max=4
 Commands\117\Command29=false
-Commands\118\Type=Scope Main Mode
-Commands\118\String=\\x27\\x14\\x00
+Commands\118\Type=Scope Sub Mode
+Commands\118\String=\\x27\\x14\\x01
 Commands\118\Min=0
 Commands\118\Max=4
 Commands\118\Command29=false
-Commands\119\Type=Scope Sub Mode
-Commands\119\String=\\x27\\x14\\x01
+Commands\119\Type=Scope Main Span
+Commands\119\String=\\x27\\x15\\x00
 Commands\119\Min=0
-Commands\119\Max=4
+Commands\119\Max=7
 Commands\119\Command29=false
-Commands\120\Type=Scope Main Span
-Commands\120\String=\\x27\\x15\\x00
+Commands\120\Type=Scope Sub Span
+Commands\120\String=\\x27\\x15\\x01
 Commands\120\Min=0
 Commands\120\Max=7
 Commands\120\Command29=false
-Commands\121\Type=Scope Sub Span
-Commands\121\String=\\x27\\x15\\x01
-Commands\121\Min=0
-Commands\121\Max=7
+Commands\121\Type=Scope Main Edge
+Commands\121\String=\\x27\\x16\\x00
+Commands\121\Min=1
+Commands\121\Max=4
 Commands\121\Command29=false
-Commands\122\Type=Scope Main Edge
-Commands\122\String=\\x27\\x16\\x00
+Commands\122\Type=Scope Sub Edge
+Commands\122\String=\\x27\\x16\\x01
 Commands\122\Min=1
 Commands\122\Max=4
 Commands\122\Command29=false
-Commands\123\Type=Scope Sub Edge
-Commands\123\String=\\x27\\x16\\x01
-Commands\123\Min=1
-Commands\123\Max=4
+Commands\123\Type=Scope Main Hold
+Commands\123\String=\\x27\\x17\\x00
+Commands\123\Min=0
+Commands\123\Max=1
 Commands\123\Command29=false
-Commands\124\Type=Scope Main Hold
-Commands\124\String=\\x27\\x17\\x00
+Commands\124\Type=Scope Sub Hold
+Commands\124\String=\\x27\\x17\\x01
 Commands\124\Min=0
 Commands\124\Max=1
 Commands\124\Command29=false
-Commands\125\Type=Scope Sub Hold
-Commands\125\String=\\x27\\x17\\x01
+Commands\125\Type=Scope Main Ref
+Commands\125\String=\\x27\\x19\\x00
 Commands\125\Min=0
-Commands\125\Max=1
+Commands\125\Max=64
 Commands\125\Command29=false
-Commands\126\Type=Scope Main Ref
-Commands\126\String=\\x27\\x19\\x00
-Commands\126\Min=-300
-Commands\126\Max=100
+Commands\126\Type=Scope Sub Ref
+Commands\126\String=\\x27\\x19\\x01
+Commands\126\Min=0
+Commands\126\Max=64
 Commands\126\Command29=false
-Commands\127\Type=Scope Sub Ref
-Commands\127\String=\\x27\\x19\\x01
-Commands\127\Min=-300
-Commands\127\Max=100
+Commands\127\Type=Scope Main Speed
+Commands\127\String=\\x27\\x1a\\x00
+Commands\127\Min=0
+Commands\127\Max=2
 Commands\127\Command29=false
-Commands\128\Type=Scope Main Speed
-Commands\128\String=\\x27\\x1a\\x00
+Commands\128\Type=Scope Sub Speed
+Commands\128\String=\\x27\\x1a\\x01
 Commands\128\Min=0
 Commands\128\Max=2
 Commands\128\Command29=false
-Commands\129\Type=Scope Sub Speed
-Commands\129\String=\\x27\\x1a\\x01
+Commands\129\Type=Scope During TX
+Commands\129\String=\\x27\\x1b
 Commands\129\Min=0
-Commands\129\Max=2
+Commands\129\Max=1
 Commands\129\Command29=false
-Commands\130\Type=Scope During TX
-Commands\130\String=\\x27\\x1b
+Commands\130\Type=Scope Center Type
+Commands\130\String=\\x27\\x1c
 Commands\130\Min=0
-Commands\130\Max=1
+Commands\130\Max=2
 Commands\130\Command29=false
-Commands\131\Type=Scope Center Type
-Commands\131\String=\\x27\\x1c
+Commands\131\Type=Scope Main VBW
+Commands\131\String=\\x27\\x1d\\x00
 Commands\131\Min=0
-Commands\131\Max=2
+Commands\131\Max=1
 Commands\131\Command29=false
-Commands\132\Type=Scope Main VBW
-Commands\132\String=\\x27\\x1d\\x00
+Commands\132\Type=Scope Sub VBW
+Commands\132\String=\\x27\\x1d\\x01
 Commands\132\Min=0
 Commands\132\Max=1
 Commands\132\Command29=false
-Commands\133\Type=Scope Sub VBW
-Commands\133\String=\\x27\\x1d\\x01
-Commands\133\Min=0
-Commands\133\Max=1
+Commands\133\Type=Scope Fixed Edge Freq
+Commands\133\String=\\x27\\x1e
+Commands\133\Min=1
+Commands\133\Max=0
 Commands\133\Command29=false
-Commands\134\Type=Scope Fixed Edge Freq
-Commands\134\String=\\x27\\x1e
-Commands\134\Min=1
-Commands\134\Max=12
+Commands\134\Type=Scope Main RBW
+Commands\134\String=\\x27\\x1f\\x00
+Commands\134\Min=0
+Commands\134\Max=2
 Commands\134\Command29=false
-Commands\135\Type=Scope Main RBW
-Commands\135\String=\\x27\\x1f\\x00
+Commands\135\Type=Scope Sub RBW
+Commands\135\String=\\x27\\x1f\\x01
 Commands\135\Min=0
 Commands\135\Max=2
 Commands\135\Command29=false
-Commands\136\Type=Scope Sub RBW
-Commands\136\String=\\x27\\x1f\\x01
+Commands\136\Type=Main/Sub Prefix
+Commands\136\String=\\x29
 Commands\136\Min=0
-Commands\136\Max=2
+Commands\136\Max=1
 Commands\136\Command29=false
-Commands\137\Type=Main/Sub Prefix
-Commands\137\String=\\x29
+Commands\137\Type=Command Error FA
+Commands\137\String=\\xfa
 Commands\137\Min=0
-Commands\137\Max=1
+Commands\137\Max=0
 Commands\137\Command29=false
-Commands\138\Type=Command Error FA
-Commands\138\String=\\xfa
+Commands\138\Type=Command OK FB
+Commands\138\String=\\xfb
 Commands\138\Min=0
 Commands\138\Max=0
 Commands\138\Command29=false
-Commands\139\Type=Command OK FB
-Commands\139\String=\\xfb
-Commands\139\Min=0
-Commands\139\Max=0
-Commands\139\Command29=false
-Commands\size=139
+Commands\size=138
 Spans\1\Num=0
 Spans\1\Name=±2.5 KHz
 Spans\1\Freq=2500
@@ -763,7 +758,7 @@ Inputs\6\Reg=4
 Inputs\6\Name=M/U
 Inputs\size=6
 Bands\1\Num=10
-Bands\1\BSR=16
+Bands\1\BSR=0
 Bands\1\Start=50000000
 Bands\1\End=54000000
 Bands\1\Range=60
@@ -854,7 +849,7 @@ Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=2200m
 Bands\14\Num=23
-Bands\14\BSR=17
+Bands\14\BSR=0
 Bands\14\Start=10000
 Bands\14\End=30000000
 Bands\14\Range=1.6
@@ -902,12 +897,12 @@ Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\9\Num=8
-Modes\9\Reg=18
+Modes\9\Reg=0
 Modes\9\Min=50
 Modes\9\Max=3600
 Modes\9\Name=PSK
 Modes\10\Num=9
-Modes\10\Reg=19
+Modes\10\Reg=0
 Modes\10\Min=50
 Modes\10\Max=3600
 Modes\10\Name=PSK-R
@@ -916,18 +911,18 @@ Attenuators\1\dB=0
 Attenuators\2\dB=3
 Attenuators\3\dB=6
 Attenuators\4\dB=9
-Attenuators\5\dB=18
-Attenuators\6\dB=21
-Attenuators\7\dB=24
-Attenuators\8\dB=33
-Attenuators\9\dB=36
-Attenuators\10\dB=39
-Attenuators\11\dB=48
-Attenuators\12\dB=51
-Attenuators\13\dB=54
-Attenuators\14\dB=57
-Attenuators\15\dB=66
-Attenuators\16\dB=69
+Attenuators\5\dB=12
+Attenuators\6\dB=15
+Attenuators\7\dB=18
+Attenuators\8\dB=21
+Attenuators\9\dB=24
+Attenuators\10\dB=27
+Attenuators\11\dB=30
+Attenuators\12\dB=33
+Attenuators\13\dB=36
+Attenuators\14\dB=39
+Attenuators\15\dB=42
+Attenuators\16\dB=45
 Attenuators\size=16
 Preamps\1\Num=0
 Preamps\1\Name=OFF
@@ -994,12 +989,12 @@ Tuning%20Steps\17\Name=1 MHz
 Tuning%20Steps\17\Hz=1000000
 Tuning%20Steps\size=17
 Filters\1\Num=1
-Filters\1\Modes=4294967295
+Filters\1\Modes=0
 Filters\1\Name=Filter 1
 Filters\2\Num=2
-Filters\2\Modes=4294967295
+Filters\2\Modes=0
 Filters\2\Name=Filter 2
 Filters\3\Num=3
-Filters\3\Modes=4294967295
+Filters\3\Modes=0
 Filters\3\Name=Filter 3
 Filters\size=3
diff --git a/rigs/IC-785x.rig b/rigs/IC-785x.rig
index ea88c65..4e50472 100644
--- a/rigs/IC-785x.rig
+++ b/rigs/IC-785x.rig
@@ -105,29 +105,29 @@ Commands\16\Command29=false
 Commands\17\Type=Memory Mode
 Commands\17\String=\\x08
 Commands\17\Min=1
-Commands\17\Max=101
+Commands\17\Max=99
 Commands\17\Command29=false
 Commands\18\Type=Memory Write
 Commands\18\String=\\x09
 Commands\18\Min=1
-Commands\18\Max=101
+Commands\18\Max=99
 Commands\18\Command29=false
 Commands\19\Type=Memory to VFO
 Commands\19\String=\\x0a
 Commands\19\Min=1
-Commands\19\Max=101
+Commands\19\Max=99
 Commands\19\Command29=false
 Commands\20\Type=Memory Clear
 Commands\20\String=\\x0b
 Commands\20\Min=1
-Commands\20\Max=101
+Commands\20\Max=99
 Commands\20\Command29=false
 Commands\21\Type=Scanning
 Commands\21\String=\\x0e
 Commands\21\Min=0
-Commands\21\Max=255
+Commands\21\Max=0
 Commands\21\Command29=false
-Commands\22\Type=Split Operation
+Commands\22\Type=Split/Duplex
 Commands\22\String=\\x0f
 Commands\22\Min=0
 Commands\22\Max=1
@@ -140,12 +140,12 @@ Commands\23\Command29=false
 Commands\24\Type=Attenuator Status
 Commands\24\String=\\x11
 Commands\24\Min=0
-Commands\24\Max=69
+Commands\24\Max=45
 Commands\24\Command29=true
 Commands\25\Type=Antenna
 Commands\25\String=\\x12
 Commands\25\Min=0
-Commands\25\Max=1
+Commands\25\Max=3
 Commands\25\Command29=true
 Commands\26\Type=Speech
 Commands\26\String=\\x13
@@ -189,8 +189,8 @@ Commands\33\Max=255
 Commands\33\Command29=true
 Commands\34\Type=CW Pitch
 Commands\34\String=\\x14\\x09
-Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Min=300
+Commands\34\Max=900
 Commands\34\Command29=false
 Commands\35\Type=RF Power
 Commands\35\String=\\x14\\x0a
@@ -204,8 +204,8 @@ Commands\36\Max=255
 Commands\36\Command29=false
 Commands\37\Type=Key Speed
 Commands\37\String=\\x14\\x0c
-Commands\37\Min=0
-Commands\37\Max=255
+Commands\37\Min=6
+Commands\37\Max=48
 Commands\37\Command29=false
 Commands\38\Type=Compressor Level
 Commands\38\String=\\x14\\x0e
@@ -250,7 +250,7 @@ Commands\45\Command29=false
 Commands\46\Type=S Meter Sql Status
 Commands\46\String=\\x15\\x01
 Commands\46\Min=0
-Commands\46\Max=255
+Commands\46\Max=1
 Commands\46\Command29=true
 Commands\47\Type=S Meter
 Commands\47\String=\\x15\\x02
@@ -260,7 +260,7 @@ Commands\47\Command29=true
 Commands\48\Type=Various Squelch
 Commands\48\String=\\x15\\x05
 Commands\48\Min=0
-Commands\48\Max=255
+Commands\48\Max=1
 Commands\48\Command29=true
 Commands\49\Type=Power Meter
 Commands\49\String=\\x15\\x11
@@ -350,7 +350,7 @@ Commands\65\Command29=false
 Commands\66\Type=Break-In Status
 Commands\66\String=\\x16\\x47
 Commands\66\Min=0
-Commands\66\Max=1
+Commands\66\Max=2
 Commands\66\Command29=false
 Commands\67\Type=Manual Notch
 Commands\67\String=\\x16\\x48
@@ -400,7 +400,7 @@ Commands\75\Command29=true
 Commands\76\Type=Send CW
 Commands\76\String=\\x17
 Commands\76\Min=0
-Commands\76\Max=30
+Commands\76\Max=0
 Commands\76\Command29=false
 Commands\77\Type=Power Control
 Commands\77\String=\\x18
@@ -415,17 +415,17 @@ Commands\78\Command29=false
 Commands\79\Type=Memory Contents
 Commands\79\String=\\x1a\\00
 Commands\79\Min=1
-Commands\79\Max=101
+Commands\79\Max=99
 Commands\79\Command29=false
 Commands\80\Type=Band Stacking Reg
 Commands\80\String=\\x1a\\x01
 Commands\80\Min=1
-Commands\80\Max=11
+Commands\80\Max=0
 Commands\80\Command29=false
 Commands\81\Type=Filter Width
 Commands\81\String=\\x1a\\x03
 Commands\81\Min=0
-Commands\81\Max=10000
+Commands\81\Max=3600
 Commands\81\Command29=true
 Commands\82\Type=Quick Split
 Commands\82\String=\\x1a\\x05\\x00\\x33
@@ -519,13 +519,13 @@ Commands\99\Max=1
 Commands\99\Command29=false
 Commands\100\Type=Dash Ratio
 Commands\100\String=\\x1a\\x05\\x02\\x51
-Commands\100\Min=28
-Commands\100\Max=45
+Commands\100\Min=0
+Commands\100\Max=0
 Commands\100\Command29=false
 Commands\101\Type=Data Mode Filter
 Commands\101\String=\\x1a\\x06
 Commands\101\Min=0
-Commands\101\Max=65535
+Commands\101\Max=0
 Commands\101\Command29=false
 Commands\102\Type=AF Mute Status
 Commands\102\String=\\x1a\\x09
@@ -559,8 +559,8 @@ Commands\107\Max=1
 Commands\107\Command29=false
 Commands\108\Type=RIT Frequency
 Commands\108\String=\\x21\\x00
-Commands\108\Min=-9999
-Commands\108\Max=9999
+Commands\108\Min=0
+Commands\108\Max=0
 Commands\108\Command29=false
 Commands\109\Type=RIT Status
 Commands\109\String=\\x21\\x01
@@ -664,13 +664,13 @@ Commands\128\Max=1
 Commands\128\Command29=false
 Commands\129\Type=Scope Main Ref
 Commands\129\String=\\x27\\x19\\x00
-Commands\129\Min=-200
-Commands\129\Max=200
+Commands\129\Min=0
+Commands\129\Max=0
 Commands\129\Command29=false
 Commands\130\Type=Scope Sub Ref
 Commands\130\String=\\x27\\x19\\x01
-Commands\130\Min=-200
-Commands\130\Max=200
+Commands\130\Min=0
+Commands\130\Max=0
 Commands\130\Command29=false
 Commands\131\Type=Scope Main Speed
 Commands\131\String=\\x27\\x1a\\x00
@@ -705,7 +705,7 @@ Commands\136\Command29=false
 Commands\137\Type=Scope Fixed Edge Freq
 Commands\137\String=\\x27\\x1e
 Commands\137\Min=1
-Commands\137\Max=12
+Commands\137\Max=0
 Commands\137\Command29=false
 Commands\138\Type=Scope Main RBW
 Commands\138\String=\\x27\\x1f\\x00
@@ -789,11 +789,11 @@ Inputs\10\Num=9
 Inputs\10\Reg=7
 Inputs\10\Name=SPD
 Inputs\11\Num=10
-Inputs\11\Reg=16
+Inputs\11\Reg=0
 Inputs\11\Name=M/U
 Inputs\size=11
 Bands\1\Num=10
-Bands\1\BSR=16
+Bands\1\BSR=0
 Bands\1\Start=50000000
 Bands\1\End=54000000
 Bands\1\Range=60
@@ -849,7 +849,7 @@ Bands\8\Range=11
 Bands\8\MemoryGroup=-1
 Bands\8\Name=40m
 Bands\9\Num=18
-Bands\9\BSR=17
+Bands\9\BSR=0
 Bands\9\Start=5250000
 Bands\9\End=5450000
 Bands\9\Range=0
@@ -870,21 +870,21 @@ Bands\11\Range=2
 Bands\11\MemoryGroup=-1
 Bands\11\Name=160m
 Bands\12\Num=21
-Bands\12\BSR=17
+Bands\12\BSR=0
 Bands\12\Start=493000
 Bands\12\End=595000
 Bands\12\Range=8
 Bands\12\MemoryGroup=-1
 Bands\12\Name=630m
 Bands\13\Num=22
-Bands\13\BSR=17
+Bands\13\BSR=0
 Bands\13\Start=135000
 Bands\13\End=138000
 Bands\13\Range=0
 Bands\13\MemoryGroup=-1
 Bands\13\Name=2200m
 Bands\14\Num=23
-Bands\14\BSR=17
+Bands\14\BSR=0
 Bands\14\Start=10000
 Bands\14\End=30000000
 Bands\14\Range=1.6
@@ -932,12 +932,12 @@ Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\9\Num=8
-Modes\9\Reg=18
+Modes\9\Reg=0
 Modes\9\Min=50
 Modes\9\Max=3600
 Modes\9\Name=PSK
 Modes\10\Num=9
-Modes\10\Reg=19
+Modes\10\Reg=0
 Modes\10\Min=50
 Modes\10\Max=3600
 Modes\10\Name=PSK-R
@@ -946,18 +946,18 @@ Attenuators\1\dB=0
 Attenuators\2\dB=3
 Attenuators\3\dB=6
 Attenuators\4\dB=9
-Attenuators\5\dB=18
-Attenuators\6\dB=21
-Attenuators\7\dB=24
-Attenuators\8\dB=33
-Attenuators\9\dB=36
-Attenuators\10\dB=39
-Attenuators\11\dB=48
-Attenuators\12\dB=51
-Attenuators\13\dB=54
-Attenuators\14\dB=57
-Attenuators\15\dB=66
-Attenuators\16\dB=69
+Attenuators\5\dB=12
+Attenuators\6\dB=15
+Attenuators\7\dB=18
+Attenuators\8\dB=21
+Attenuators\9\dB=24
+Attenuators\10\dB=27
+Attenuators\11\dB=30
+Attenuators\12\dB=33
+Attenuators\13\dB=36
+Attenuators\14\dB=39
+Attenuators\15\dB=42
+Attenuators\16\dB=45
 Attenuators\size=16
 Preamps\1\Num=0
 Preamps\1\Name=OFF
@@ -1028,12 +1028,12 @@ Tuning%20Steps\17\Name=1 MHz
 Tuning%20Steps\17\Hz=1000000
 Tuning%20Steps\size=17
 Filters\1\Num=1
-Filters\1\Modes=4294967295
+Filters\1\Modes=0
 Filters\1\Name=FIL1
 Filters\2\Num=2
-Filters\2\Modes=4294967295
+Filters\2\Modes=0
 Filters\2\Name=FIL2
 Filters\3\Num=3
-Filters\3\Modes=4294967295
+Filters\3\Modes=0
 Filters\3\Name=FIL3
 Filters\size=3
diff --git a/rigs/IC-905.rig b/rigs/IC-905.rig
index 069327c..607303c 100644
--- a/rigs/IC-905.rig
+++ b/rigs/IC-905.rig
@@ -22,693 +22,682 @@ MemStart=0
 MemFormat=%1.2a %3.2b %5.1d %6.5f %11.1g %12.1h %13.1i %14.1j %15.1m %16.3l %19.3o %22.1np %23.2q %25.1r %26.3s %29.8t %37.8u %45.8v %53.16z
 SatMemories=0
 SatFormat=
-Commands\1\Type=AF Gain
-Commands\1\String=\\x14\\x01
+Commands\1\Type=Freq (TRX)
+Commands\1\String=\\x00
 Commands\1\Min=0
-Commands\1\Max=255
+Commands\1\Max=0
 Commands\1\Command29=false
-Commands\2\Type=AFC Function
-Commands\2\String=\\x16\\x4a
+Commands\2\Type=Mode (TRX)
+Commands\2\String=\\x01
 Commands\2\Min=0
-Commands\2\Max=1
+Commands\2\Max=0
 Commands\2\Command29=false
-Commands\3\Type=AGC Time Constant
-Commands\3\String=\\x16\\x12
-Commands\3\Min=1
-Commands\3\Max=3
+Commands\3\Type=Band Edge Freq
+Commands\3\String=\\x02
+Commands\3\Min=0
+Commands\3\Max=0
 Commands\3\Command29=false
-Commands\4\Type=ALC Meter
-Commands\4\String=\\x15\\x13
+Commands\4\Type=Freq Get
+Commands\4\String=\\x03
 Commands\4\Min=0
-Commands\4\Max=255
+Commands\4\Max=0
 Commands\4\Command29=false
-Commands\5\Type=Anti-Vox Gain
-Commands\5\String=\\x14\\x17
+Commands\5\Type=Mode Get
+Commands\5\String=\\x04
 Commands\5\Min=0
-Commands\5\Max=255
+Commands\5\Max=0
 Commands\5\Command29=false
-Commands\6\Type=Attenuator Status
-Commands\6\String=\\x11
+Commands\6\Type=Freq Set
+Commands\6\String=\\x05
 Commands\6\Min=0
-Commands\6\Max=45
+Commands\6\Max=0
 Commands\6\Command29=false
-Commands\7\Type=Auto Notch
-Commands\7\String=\\x16\\x41
+Commands\7\Type=Mode Set
+Commands\7\String=\\x06
 Commands\7\Min=0
-Commands\7\Max=1
+Commands\7\Max=0
 Commands\7\Command29=false
-Commands\8\Type=Band Edge Freq
-Commands\8\String=\\x02
+Commands\8\Type=VFO A Select
+Commands\8\String=\\x07\\x00
 Commands\8\Min=0
 Commands\8\Max=0
 Commands\8\Command29=false
-Commands\9\Type=Band Stacking Reg
-Commands\9\String=\\x1a\\x01
+Commands\9\Type=VFO B Select
+Commands\9\String=\\x07\\x01
 Commands\9\Min=0
-Commands\9\Max=11
+Commands\9\Max=0
 Commands\9\Command29=false
-Commands\10\Type=Break-In Delay
-Commands\10\String=\\x14\\x0f
+Commands\10\Type=VFO Equal AB
+Commands\10\String=\\x07\\xa0
 Commands\10\Min=0
-Commands\10\Max=255
+Commands\10\Max=0
 Commands\10\Command29=false
-Commands\11\Type=Break-In Status
-Commands\11\String=\\x16\\x47
+Commands\11\Type=VFO Swap A/B
+Commands\11\String=\\x07\\xb0
 Commands\11\Min=0
-Commands\11\Max=1
+Commands\11\Max=0
 Commands\11\Command29=false
-Commands\12\Type=CIV Transceive
-Commands\12\String=\\x1a\\x05\\x01\\x42
+Commands\12\Type=Memory Mode
+Commands\12\String=\\x08
 Commands\12\Min=0
-Commands\12\Max=1
+Commands\12\Max=63
 Commands\12\Command29=false
-Commands\13\Type=Command Error FA
-Commands\13\String=\\xfa
+Commands\13\Type=Memory Write
+Commands\13\String=\\x09
 Commands\13\Min=0
-Commands\13\Max=0
+Commands\13\Max=63
 Commands\13\Command29=false
-Commands\14\Type=Command OK FB
-Commands\14\String=\\xfb
+Commands\14\Type=Memory to VFO
+Commands\14\String=\\x0a
 Commands\14\Min=0
-Commands\14\Max=0
+Commands\14\Max=63
 Commands\14\Command29=false
-Commands\15\Type=Comp Meter
-Commands\15\String=\\x15\\x14
+Commands\15\Type=Memory Clear
+Commands\15\String=\\x0b
 Commands\15\Min=0
-Commands\15\Max=255
+Commands\15\Max=63
 Commands\15\Command29=false
-Commands\16\Type=Compressor Level
-Commands\16\String=\\x14\\x0e
+Commands\16\Type=Split/Duplex
+Commands\16\String=\\x0f
 Commands\16\Min=0
-Commands\16\Max=255
+Commands\16\Max=1
 Commands\16\Command29=false
-Commands\17\Type=Compressor Status
-Commands\17\String=\\x16\\x44
+Commands\17\Type=Tuning Step
+Commands\17\String=\\x10
 Commands\17\Min=0
-Commands\17\Max=1
+Commands\17\Max=12
 Commands\17\Command29=false
-Commands\18\Type=CW Pitch
-Commands\18\String=\\x14\\x09
+Commands\18\Type=Attenuator Status
+Commands\18\String=\\x11
 Commands\18\Min=0
-Commands\18\Max=255
+Commands\18\Max=0
 Commands\18\Command29=false
-Commands\19\Type=Data Off Mod Input
-Commands\19\String=\\x1a\\x05\\x01\\x26
+Commands\19\Type=Speech
+Commands\19\String=\\x13
 Commands\19\Min=0
-Commands\19\Max=3
+Commands\19\Max=2
 Commands\19\Command29=false
-Commands\20\Type=DATA1 Mod Input
-Commands\20\String=\\x1a\\x05\\x01\\x27
+Commands\20\Type=AF Gain
+Commands\20\String=\\x14\\x01
 Commands\20\Min=0
-Commands\20\Max=3
+Commands\20\Max=0
 Commands\20\Command29=false
-Commands\21\Type=Dial Lock Status
-Commands\21\String=\\x16\\x50
+Commands\21\Type=RF Gain
+Commands\21\String=\\x14\\x02
 Commands\21\Min=0
-Commands\21\Max=1
+Commands\21\Max=0
 Commands\21\Command29=false
-Commands\22\Type=DSP IF Filter
-Commands\22\String=\\x16\\x56
+Commands\22\Type=Squelch
+Commands\22\String=\\x14\\x03
 Commands\22\Min=0
-Commands\22\Max=1
+Commands\22\Max=0
 Commands\22\Command29=false
-Commands\23\Type=DSQL Setting
-Commands\23\String=\\x16\\x5b
+Commands\23\Type=NR Level
+Commands\23\String=\\x14\\x06
 Commands\23\Min=0
-Commands\23\Max=2
+Commands\23\Max=0
 Commands\23\Command29=false
-Commands\24\Type=DTCS Code/Polarity
-Commands\24\String=\\x16\\x5d
+Commands\24\Type=PBT Inner
+Commands\24\String=\\x14\\x07
 Commands\24\Min=0
-Commands\24\Max=3
+Commands\24\Max=0
 Commands\24\Command29=false
-Commands\25\Type=Filter Width
-Commands\25\String=\\x1a\\x03
+Commands\25\Type=PBT Outer
+Commands\25\String=\\x14\\x08
 Commands\25\Min=0
-Commands\25\Max=10000
+Commands\25\Max=0
 Commands\25\Command29=false
-Commands\26\Type=Freq (TRX)
-Commands\26\String=\\x00
+Commands\26\Type=CW Pitch
+Commands\26\String=\\x14\\x09
 Commands\26\Min=0
 Commands\26\Max=0
 Commands\26\Command29=false
-Commands\27\Type=Freq Get
-Commands\27\String=\\x03
+Commands\27\Type=RF Power
+Commands\27\String=\\x14\\x0a
 Commands\27\Min=0
 Commands\27\Max=0
 Commands\27\Command29=false
-Commands\28\Type=Freq Set
-Commands\28\String=\\x05
+Commands\28\Type=Mic Gain
+Commands\28\String=\\x14\\x0b
 Commands\28\Min=0
 Commands\28\Max=0
 Commands\28\Command29=false
-Commands\29\Type=Id Meter
-Commands\29\String=\\x15\\x16
+Commands\29\Type=Key Speed
+Commands\29\String=\\x14\\x0c
 Commands\29\Min=0
-Commands\29\Max=255
+Commands\29\Max=0
 Commands\29\Command29=false
-Commands\30\Type=Key Speed
-Commands\30\String=\\x14\\x0c
+Commands\30\Type=Compressor Level
+Commands\30\String=\\x14\\x0e
 Commands\30\Min=0
-Commands\30\Max=255
+Commands\30\Max=0
 Commands\30\Command29=false
-Commands\31\Type=LAN Mod Level
-Commands\31\String=\\x1a\\x05\\x01\\x25
+Commands\31\Type=Break-In Delay
+Commands\31\String=\\x14\\x0f
 Commands\31\Min=0
-Commands\31\Max=255
+Commands\31\Max=0
 Commands\31\Command29=false
-Commands\32\Type=Manual Notch
-Commands\32\String=\\x16\\x48
+Commands\32\Type=NB Level
+Commands\32\String=\\x14\\x12
 Commands\32\Min=0
-Commands\32\Max=1
+Commands\32\Max=0
 Commands\32\Command29=false
-Commands\33\Type=Manual Notch Width
-Commands\33\String=\\x16\\x57
+Commands\33\Type=Monitor Gain
+Commands\33\String=\\x14\\x15
 Commands\33\Min=0
-Commands\33\Max=2
+Commands\33\Max=0
 Commands\33\Command29=false
-Commands\34\Type=Memory Clear
-Commands\34\String=\\x0b
+Commands\34\Type=Vox Gain
+Commands\34\String=\\x14\\x16
 Commands\34\Min=0
-Commands\34\Max=99
+Commands\34\Max=0
 Commands\34\Command29=false
-Commands\35\Type=Memory Contents
-Commands\35\String=\\x1a\\x00
+Commands\35\Type=Anti-Vox Gain
+Commands\35\String=\\x14\\x17
 Commands\35\Min=0
-Commands\35\Max=99
+Commands\35\Max=0
 Commands\35\Command29=false
-Commands\36\Type=Memory Mode
-Commands\36\String=\\x08
+Commands\36\Type=S Meter Sql Status
+Commands\36\String=\\x15\\x01
 Commands\36\Min=0
-Commands\36\Max=99
+Commands\36\Max=1
 Commands\36\Command29=false
-Commands\37\Type=Memory to VFO
-Commands\37\String=\\x0a
+Commands\37\Type=S Meter
+Commands\37\String=\\x15\\x02
 Commands\37\Min=0
-Commands\37\Max=99
+Commands\37\Max=0
 Commands\37\Command29=false
-Commands\38\Type=Memory Write
-Commands\38\String=\\x09
+Commands\38\Type=Various Squelch
+Commands\38\String=\\x15\\x05
 Commands\38\Min=0
-Commands\38\Max=99
+Commands\38\Max=1
 Commands\38\Command29=false
-Commands\39\Type=Mic Gain
-Commands\39\String=\\x14\\x0b
+Commands\39\Type=Overflow Status
+Commands\39\String=\\x15\\x07
 Commands\39\Min=0
-Commands\39\Max=255
+Commands\39\Max=1
 Commands\39\Command29=false
-Commands\40\Type=Mode (TRX)
-Commands\40\String=\\x01
+Commands\40\Type=Power Meter
+Commands\40\String=\\x15\\x11
 Commands\40\Min=0
 Commands\40\Max=0
 Commands\40\Command29=false
-Commands\41\Type=Mode Get
-Commands\41\String=\\x04
+Commands\41\Type=SWR Meter
+Commands\41\String=\\x15\\x12
 Commands\41\Min=0
 Commands\41\Max=0
 Commands\41\Command29=false
-Commands\42\Type=Mode Set
-Commands\42\String=\\x06
+Commands\42\Type=ALC Meter
+Commands\42\String=\\x15\\x13
 Commands\42\Min=0
 Commands\42\Max=0
 Commands\42\Command29=false
-Commands\43\Type=Monitor Gain
-Commands\43\String=\\x14\\x15
+Commands\43\Type=Comp Meter
+Commands\43\String=\\x15\\x14
 Commands\43\Min=0
-Commands\43\Max=255
+Commands\43\Max=0
 Commands\43\Command29=false
-Commands\44\Type=Monitor Status
-Commands\44\String=\\x16\\x45
+Commands\44\Type=Vd Meter
+Commands\44\String=\\x15\\x15
 Commands\44\Min=0
-Commands\44\Max=1
+Commands\44\Max=0
 Commands\44\Command29=false
-Commands\45\Type=NB Level
-Commands\45\String=\\x14\\x12
+Commands\45\Type=Id Meter
+Commands\45\String=\\x15\\x16
 Commands\45\Min=0
-Commands\45\Max=255
+Commands\45\Max=0
 Commands\45\Command29=false
-Commands\46\Type=Noise Blanker
-Commands\46\String=\\x16\\x22
+Commands\46\Type=Preamp Status
+Commands\46\String=\\x16\\x02
 Commands\46\Min=0
 Commands\46\Max=1
 Commands\46\Command29=false
-Commands\47\Type=Noise Reduction
-Commands\47\String=\\x16\\x40
-Commands\47\Min=0
-Commands\47\Max=1
+Commands\47\Type=AGC Time Constant
+Commands\47\String=\\x16\\x12
+Commands\47\Min=1
+Commands\47\Max=3
 Commands\47\Command29=false
-Commands\48\Type=NR Level
-Commands\48\String=\\x14\\x06
+Commands\48\Type=Noise Blanker
+Commands\48\String=\\x16\\x22
 Commands\48\Min=0
-Commands\48\Max=255
+Commands\48\Max=1
 Commands\48\Command29=false
-Commands\49\Type=Overflow Status
-Commands\49\String=\\x15\\x07
+Commands\49\Type=Noise Reduction
+Commands\49\String=\\x16\\x40
 Commands\49\Min=0
 Commands\49\Max=1
 Commands\49\Command29=false
-Commands\50\Type=PBT Inner
-Commands\50\String=\\x14\\x07
+Commands\50\Type=Auto Notch
+Commands\50\String=\\x16\\x41
 Commands\50\Min=0
-Commands\50\Max=255
+Commands\50\Max=1
 Commands\50\Command29=false
-Commands\51\Type=PBT Outer
-Commands\51\String=\\x14\\x08
+Commands\51\Type=Repeater Tone
+Commands\51\String=\\x16\\x42
 Commands\51\Min=0
-Commands\51\Max=255
+Commands\51\Max=1
 Commands\51\Command29=false
-Commands\52\Type=Power Control
-Commands\52\String=\\x18
+Commands\52\Type=Repeater TSQL
+Commands\52\String=\\x16\\x43
 Commands\52\Min=0
-Commands\52\Max=0
+Commands\52\Max=1
 Commands\52\Command29=false
-Commands\53\Type=Power Meter
-Commands\53\String=\\x15\\x11
+Commands\53\Type=Compressor Status
+Commands\53\String=\\x16\\x44
 Commands\53\Min=0
-Commands\53\Max=255
+Commands\53\Max=1
 Commands\53\Command29=false
-Commands\54\Type=Preamp Status
-Commands\54\String=\\x16\\x02
+Commands\54\Type=Monitor Status
+Commands\54\String=\\x16\\x45
 Commands\54\Min=0
 Commands\54\Max=1
 Commands\54\Command29=false
-Commands\55\Type=Quick Split
-Commands\55\String=\\x1a\\x05\\x00\\x46
+Commands\55\Type=Vox Status
+Commands\55\String=\\x16\\x46
 Commands\55\Min=0
 Commands\55\Max=1
 Commands\55\Command29=false
-Commands\56\Type=REF Adjust
-Commands\56\String=\\x1a\\x05\\x00\\x93
+Commands\56\Type=Break-In Status
+Commands\56\String=\\x16\\x47
 Commands\56\Min=0
-Commands\56\Max=511
+Commands\56\Max=1
 Commands\56\Command29=false
-Commands\57\Type=Repeater DTCS
-Commands\57\String=\\x16\\x4b
+Commands\57\Type=Manual Notch
+Commands\57\String=\\x16\\x48
 Commands\57\Min=0
 Commands\57\Max=1
 Commands\57\Command29=false
-Commands\58\Type=Repeater Tone
-Commands\58\String=\\x16\\x42
+Commands\58\Type=AFC Function
+Commands\58\String=\\x16\\x4a
 Commands\58\Min=0
 Commands\58\Max=1
 Commands\58\Command29=false
-Commands\59\Type=Repeater TSQL
-Commands\59\String=\\x16\\x43
+Commands\59\Type=Repeater DTCS
+Commands\59\String=\\x16\\x4b
 Commands\59\Min=0
 Commands\59\Max=1
 Commands\59\Command29=false
-Commands\60\Type=RF Gain
-Commands\60\String=\\x14\\x02
+Commands\60\Type=Twin Peak Filter
+Commands\60\String=\\x16\\x4f
 Commands\60\Min=0
-Commands\60\Max=255
+Commands\60\Max=1
 Commands\60\Command29=false
-Commands\61\Type=RF Power
-Commands\61\String=\\x14\\x0a
+Commands\61\Type=Dial Lock Status
+Commands\61\String=\\x16\\x50
 Commands\61\Min=0
-Commands\61\Max=255
+Commands\61\Max=1
 Commands\61\Command29=false
-Commands\62\Type=S Meter
-Commands\62\String=\\x15\\x02
+Commands\62\Type=DSP IF Filter
+Commands\62\String=\\x16\\x56
 Commands\62\Min=0
-Commands\62\Max=255
+Commands\62\Max=1
 Commands\62\Command29=false
-Commands\63\Type=S Meter Sql Status
-Commands\63\String=\\x15\\x01
+Commands\63\Type=Manual Notch Width
+Commands\63\String=\\x16\\x57
 Commands\63\Min=0
-Commands\63\Max=1
+Commands\63\Max=2
 Commands\63\Command29=false
-Commands\64\Type=Scope Center Type
-Commands\64\String=\\x27\\x1c
+Commands\64\Type=SSB TX Bandwidth
+Commands\64\String=\\x16\\x58
 Commands\64\Min=0
 Commands\64\Max=2
 Commands\64\Command29=false
-Commands\65\Type=Scope Data Output
-Commands\65\String=\\x27\\x11
+Commands\65\Type=DSQL Setting
+Commands\65\String=\\x16\\x5b
 Commands\65\Min=0
-Commands\65\Max=1
+Commands\65\Max=2
 Commands\65\Command29=false
-Commands\66\Type=Scope During TX
-Commands\66\String=\\x27\\x1b
+Commands\66\Type=DTCS Code/Polarity
+Commands\66\String=\\x16\\x5d
 Commands\66\Min=0
-Commands\66\Max=1
+Commands\66\Max=3
 Commands\66\Command29=false
-Commands\67\Type=Scope Fixed Edge Freq
-Commands\67\String=\\x27\\x1e
-Commands\67\Min=1
-Commands\67\Max=12
+Commands\67\Type=Send CW
+Commands\67\String=\\x17
+Commands\67\Min=0
+Commands\67\Max=0
 Commands\67\Command29=false
-Commands\68\Type=Scope Main Edge
-Commands\68\String=\\x27\\x16\\x00
-Commands\68\Min=1
-Commands\68\Max=4
+Commands\68\Type=Power Control
+Commands\68\String=\\x18
+Commands\68\Min=0
+Commands\68\Max=0
 Commands\68\Command29=false
-Commands\69\Type=Scope Main Hold
-Commands\69\String=\\x27\\x17\\x00
+Commands\69\Type=Transceiver ID
+Commands\69\String=\\x19
 Commands\69\Min=0
-Commands\69\Max=1
+Commands\69\Max=0
 Commands\69\Command29=false
-Commands\70\Type=Scope Main Mode
-Commands\70\String=\\x27\\x14\\x00
+Commands\70\Type=Memory Contents
+Commands\70\String=\\x1a\\x00
 Commands\70\Min=0
-Commands\70\Max=4
+Commands\70\Max=63
 Commands\70\Command29=false
-Commands\71\Type=Scope Main RBW
-Commands\71\String=\\x27\\x1f\\x00
+Commands\71\Type=Band Stacking Reg
+Commands\71\String=\\x1a\\x01
 Commands\71\Min=0
-Commands\71\Max=2
+Commands\71\Max=0
 Commands\71\Command29=false
-Commands\72\Type=Scope Main Ref
-Commands\72\String=\\x27\\x19\\x00
-Commands\72\Min=-512
-Commands\72\Max=512
+Commands\72\Type=Filter Width
+Commands\72\String=\\x1a\\x03
+Commands\72\Min=0
+Commands\72\Max=2710
 Commands\72\Command29=false
-Commands\73\Type=Scope Main Span
-Commands\73\String=\\x27\\x15\\x00
+Commands\73\Type=Quick Split
+Commands\73\String=\\x1a\\x05\\x00\\x46
 Commands\73\Min=0
-Commands\73\Max=18
+Commands\73\Max=1
 Commands\73\Command29=false
-Commands\74\Type=Scope Main Speed
-Commands\74\String=\\x27\\x1a\\x00
+Commands\74\Type=REF Adjust
+Commands\74\String=\\x1a\\x05\\x00\\x93
 Commands\74\Min=0
-Commands\74\Max=2
+Commands\74\Max=0
 Commands\74\Command29=false
-Commands\75\Type=Scope Main VBW
-Commands\75\String=\\x27\\x1d\\x00
+Commands\75\Type=USB Mod Level
+Commands\75\String=\\x1a\\x05\\x01\\x24
 Commands\75\Min=0
-Commands\75\Max=1
+Commands\75\Max=0
 Commands\75\Command29=false
-Commands\76\Type=Scope Main Wave Data
-Commands\76\String=\\x27\\x00\\x00
+Commands\76\Type=LAN Mod Level
+Commands\76\String=\\x1a\\x05\\x01\\x25
 Commands\76\Min=0
 Commands\76\Max=0
 Commands\76\Command29=false
-Commands\77\Type=Scope Main/Sub
-Commands\77\String=\\x27\\x12
+Commands\77\Type=Data Off Mod Input
+Commands\77\String=\\x1a\\x05\\x01\\x26
 Commands\77\Min=0
-Commands\77\Max=0
+Commands\77\Max=3
 Commands\77\Command29=false
-Commands\78\Type=Scope On/Off
-Commands\78\String=\\x27\\x10
+Commands\78\Type=DATA1 Mod Input
+Commands\78\String=\\x1a\\x05\\x01\\x27
 Commands\78\Min=0
-Commands\78\Max=1
+Commands\78\Max=3
 Commands\78\Command29=false
-Commands\79\Type=Scope Single/Dual
-Commands\79\String=\\x27\\x13
+Commands\79\Type=CIV Transceive
+Commands\79\String=\\x1a\\x05\\x01\\x42
 Commands\79\Min=0
-Commands\79\Max=0
+Commands\79\Max=1
 Commands\79\Command29=false
-Commands\80\Type=Selected Freq
-Commands\80\String=\\x25\\x00
+Commands\80\Type=Transceiver Status
+Commands\80\String=\\x1c\\x00
 Commands\80\Min=0
-Commands\80\Max=0
+Commands\80\Max=1
 Commands\80\Command29=false
-Commands\81\Type=Selected Mode
-Commands\81\String=\\x26\\x00
+Commands\81\Type=Selected Freq
+Commands\81\String=\\x25\\x00
 Commands\81\Min=0
 Commands\81\Max=0
 Commands\81\Command29=false
-Commands\82\Type=Send CW
-Commands\82\String=\\x17
+Commands\82\Type=Unselected Freq
+Commands\82\String=\\x25\\x01
 Commands\82\Min=0
-Commands\82\Max=30
+Commands\82\Max=0
 Commands\82\Command29=false
-Commands\83\Type=Speech
-Commands\83\String=\\x13
+Commands\83\Type=Selected Mode
+Commands\83\String=\\x26\\x00
 Commands\83\Min=0
-Commands\83\Max=2
+Commands\83\Max=0
 Commands\83\Command29=false
-Commands\84\Type=Split/Duplex
-Commands\84\String=\\x0f
+Commands\84\Type=Unselected Mode
+Commands\84\String=\\x26\\x01
 Commands\84\Min=0
-Commands\84\Max=1
+Commands\84\Max=0
 Commands\84\Command29=false
-Commands\85\Type=Squelch
-Commands\85\String=\\x14\\x03
+Commands\85\Type=Scope Main Wave Data
+Commands\85\String=\\x27\\x00\\x00
 Commands\85\Min=0
-Commands\85\Max=255
+Commands\85\Max=0
 Commands\85\Command29=false
-Commands\86\Type=SSB TX Bandwidth
-Commands\86\String=\\x16\\x58
+Commands\86\Type=Scope On/Off
+Commands\86\String=\\x27\\x10
 Commands\86\Min=0
-Commands\86\Max=2
+Commands\86\Max=1
 Commands\86\Command29=false
-Commands\87\Type=SWR Meter
-Commands\87\String=\\x15\\x12
+Commands\87\Type=Scope Data Output
+Commands\87\String=\\x27\\x11
 Commands\87\Min=0
-Commands\87\Max=255
+Commands\87\Max=1
 Commands\87\Command29=false
-Commands\88\Type=Transceiver ID
-Commands\88\String=\\x19
+Commands\88\Type=Scope Main/Sub
+Commands\88\String=\\x27\\x12
 Commands\88\Min=0
 Commands\88\Max=0
 Commands\88\Command29=false
-Commands\89\Type=Transceiver Status
-Commands\89\String=\\x1c\\x00
+Commands\89\Type=Scope Single/Dual
+Commands\89\String=\\x27\\x13
 Commands\89\Min=0
-Commands\89\Max=1
+Commands\89\Max=0
 Commands\89\Command29=false
-Commands\90\Type=Tuning Step
-Commands\90\String=\\x10
+Commands\90\Type=Scope Main Mode
+Commands\90\String=\\x27\\x14\\x00
 Commands\90\Min=0
-Commands\90\Max=18
+Commands\90\Max=4
 Commands\90\Command29=false
-Commands\91\Type=Twin Peak Filter
-Commands\91\String=\\x16\\x4f
+Commands\91\Type=Scope Main Span
+Commands\91\String=\\x27\\x15\\x00
 Commands\91\Min=0
-Commands\91\Max=1
+Commands\91\Max=12
 Commands\91\Command29=false
-Commands\92\Type=Unselected Freq
-Commands\92\String=\\x25\\x01
-Commands\92\Min=0
-Commands\92\Max=0
+Commands\92\Type=Scope Main Edge
+Commands\92\String=\\x27\\x16\\x00
+Commands\92\Min=1
+Commands\92\Max=4
 Commands\92\Command29=false
-Commands\93\Type=Unselected Mode
-Commands\93\String=\\x26\\x01
+Commands\93\Type=Scope Main Hold
+Commands\93\String=\\x27\\x17\\x00
 Commands\93\Min=0
-Commands\93\Max=0
+Commands\93\Max=1
 Commands\93\Command29=false
-Commands\94\Type=USB Mod Level
-Commands\94\String=\\x1a\\x05\\x01\\x24
-Commands\94\Min=0
-Commands\94\Max=255
+Commands\94\Type=Scope Main Ref
+Commands\94\String=\\x27\\x19\\x00
+Commands\94\Min=-200
+Commands\94\Max=200
 Commands\94\Command29=false
-Commands\95\Type=Various Squelch
-Commands\95\String=\\x15\\x05
+Commands\95\Type=Scope Main Speed
+Commands\95\String=\\x27\\x1a\\x00
 Commands\95\Min=0
-Commands\95\Max=1
+Commands\95\Max=2
 Commands\95\Command29=false
-Commands\96\Type=Vd Meter
-Commands\96\String=\\x15\\x15
+Commands\96\Type=Scope During TX
+Commands\96\String=\\x27\\x1b
 Commands\96\Min=0
-Commands\96\Max=255
+Commands\96\Max=1
 Commands\96\Command29=false
-Commands\97\Type=VFO A Select
-Commands\97\String=\\x07\\x00
+Commands\97\Type=Scope Center Type
+Commands\97\String=\\x27\\x1c
 Commands\97\Min=0
-Commands\97\Max=0
+Commands\97\Max=2
 Commands\97\Command29=false
-Commands\98\Type=VFO B Select
-Commands\98\String=\\x07\\x01
+Commands\98\Type=Scope Main VBW
+Commands\98\String=\\x27\\x1d\\x00
 Commands\98\Min=0
-Commands\98\Max=0
+Commands\98\Max=1
 Commands\98\Command29=false
-Commands\99\Type=VFO Equal AB
-Commands\99\String=\\x07\\xa0
-Commands\99\Min=0
+Commands\99\Type=Scope Fixed Edge Freq
+Commands\99\String=\\x27\\x1e
+Commands\99\Min=1
 Commands\99\Max=0
 Commands\99\Command29=false
-Commands\100\Type=VFO Swap A/B
-Commands\100\String=\\x07\\xb0
+Commands\100\Type=Scope Main RBW
+Commands\100\String=\\x27\\x1f\\x00
 Commands\100\Min=0
-Commands\100\Max=0
+Commands\100\Max=2
 Commands\100\Command29=false
 Commands\101\Type=Voice TX
 Commands\101\String=\\x28
 Commands\101\Min=0
 Commands\101\Max=8
 Commands\101\Command29=false
-Commands\102\Type=Vox Gain
-Commands\102\String=\\x14\\x16
+Commands\102\Type=Command Error FA
+Commands\102\String=\\xfa
 Commands\102\Min=0
-Commands\102\Max=255
+Commands\102\Max=0
 Commands\102\Command29=false
-Commands\103\Type=Vox Status
-Commands\103\String=\\x16\\x46
+Commands\103\Type=Command OK FB
+Commands\103\String=\\xfb
 Commands\103\Min=0
-Commands\103\Max=1
+Commands\103\Max=0
 Commands\103\Command29=false
 Commands\size=103
 Spans\1\Num=0
 Spans\1\Name=2.5 KHz
 Spans\1\Freq=2500
-Spans\2\Num=1
-Spans\2\Name=5 KHz
-Spans\2\Freq=5000
-Spans\3\Num=2
-Spans\3\Name=10 KHz
-Spans\3\Freq=10000
-Spans\4\Num=3
-Spans\4\Name=25 KHz
-Spans\4\Freq=25000
-Spans\5\Num=4
-Spans\5\Name=50 KHz
-Spans\5\Freq=50000
-Spans\6\Num=5
-Spans\6\Name=100 KHz
-Spans\6\Freq=100000
-Spans\7\Num=6
-Spans\7\Name=250 KHz
-Spans\7\Freq=250000
-Spans\8\Num=7
-Spans\8\Name=500 KHz
-Spans\8\Freq=500000
-Spans\9\Num=8
-Spans\9\Name=1 MHz
-Spans\9\Freq=1000000
-Spans\10\Num=9
-Spans\10\Name=2.5 MHz
-Spans\10\Freq=2500000
-Spans\11\Num=0
-Spans\11\Name=5 MHz
-Spans\11\Freq=5000000
-Spans\12\Num=0
-Spans\12\Name=10 MHz
-Spans\12\Freq=10000000
-Spans\13\Num=0
-Spans\13\Name=25 MHz
-Spans\13\Freq=25000000
+Spans\2\Num=0
+Spans\2\Name=5 MHz
+Spans\2\Freq=5000000
+Spans\3\Num=0
+Spans\3\Name=10 MHz
+Spans\3\Freq=10000000
+Spans\4\Num=0
+Spans\4\Name=25 MHz
+Spans\4\Freq=25000000
+Spans\5\Num=1
+Spans\5\Name=5 KHz
+Spans\5\Freq=5000
+Spans\6\Num=2
+Spans\6\Name=10 KHz
+Spans\6\Freq=10000
+Spans\7\Num=3
+Spans\7\Name=25 KHz
+Spans\7\Freq=25000
+Spans\8\Num=4
+Spans\8\Name=50 KHz
+Spans\8\Freq=50000
+Spans\9\Num=5
+Spans\9\Name=100 KHz
+Spans\9\Freq=100000
+Spans\10\Num=6
+Spans\10\Name=250 KHz
+Spans\10\Freq=250000
+Spans\11\Num=7
+Spans\11\Name=500 KHz
+Spans\11\Freq=500000
+Spans\12\Num=8
+Spans\12\Name=1 MHz
+Spans\12\Freq=1000000
+Spans\13\Num=9
+Spans\13\Name=2.5 MHz
+Spans\13\Freq=2500000
 Spans\size=13
 Inputs\1\Num=0
 Inputs\1\Reg=0
 Inputs\1\Name=MIC
-Inputs\2\Num=11
-Inputs\2\Reg=1
-Inputs\2\Name=AV
-Inputs\3\Num=12
-Inputs\3\Reg=2
-Inputs\3\Name=M/A
-Inputs\4\Num=3
-Inputs\4\Reg=3
-Inputs\4\Name=USB
-Inputs\5\Num=10
-Inputs\5\Reg=4
-Inputs\5\Name=M/U
-Inputs\6\Num=4
-Inputs\6\Reg=5
-Inputs\6\Name=LAN
+Inputs\2\Num=3
+Inputs\2\Reg=3
+Inputs\2\Name=USB
+Inputs\3\Num=4
+Inputs\3\Reg=5
+Inputs\3\Name=LAN
+Inputs\4\Num=10
+Inputs\4\Reg=4
+Inputs\4\Name=M/U
+Inputs\5\Num=11
+Inputs\5\Reg=1
+Inputs\5\Name=AV
+Inputs\6\Num=12
+Inputs\6\Reg=2
+Inputs\6\Name=M/A
 Inputs\size=6
-Bands\1\Num=6
-Bands\1\BSR=1
-Bands\1\Start=144000000
-Bands\1\End=146000000
-Bands\1\Range=146
+Bands\1\Num=0
+Bands\1\BSR=6
+Bands\1\Start=1410065408
+Bands\1\End=1910065408
+Bands\1\Range=10500
 Bands\1\MemoryGroup=-1
-Bands\1\Name=2 m
-Bands\2\Num=5
-Bands\2\BSR=2
-Bands\2\Start=430000000
-Bands\2\End=440000000
-Bands\2\Range=440
+Bands\1\Name=3 cm
+Bands\2\Num=1
+Bands\2\BSR=5
+Bands\2\Start=1355032704
+Bands\2\End=1630032704
+Bands\2\Range=5925
 Bands\2\MemoryGroup=-1
-Bands\2\Name=70 cm
-Bands\3\Num=4
-Bands\3\BSR=3
-Bands\3\Start=1240000000
-Bands\3\End=1300000000
-Bands\3\Range=1300
+Bands\2\Name=6 cm
+Bands\3\Num=3
+Bands\3\BSR=4
+Bands\3\Start=0
+Bands\3\End=0
+Bands\3\Range=2450
 Bands\3\MemoryGroup=-1
-Bands\3\Name=23 cm
-Bands\4\Num=3
-Bands\4\BSR=4
-Bands\4\Start=2300000000
-Bands\4\End=2450000000
-Bands\4\Range=2450
+Bands\3\Name=13 cm
+Bands\4\Num=4
+Bands\4\BSR=3
+Bands\4\Start=1240000000
+Bands\4\End=1300000000
+Bands\4\Range=1300
 Bands\4\MemoryGroup=-1
-Bands\4\Name=13 cm
-Bands\5\Num=1
-Bands\5\BSR=5
-Bands\5\Start=5650000000
-Bands\5\End=5925000000
-Bands\5\Range=5925
+Bands\4\Name=23 cm
+Bands\5\Num=5
+Bands\5\BSR=2
+Bands\5\Start=430000000
+Bands\5\End=440000000
+Bands\5\Range=440
 Bands\5\MemoryGroup=-1
-Bands\5\Name=6 cm
-Bands\6\Num=0
-Bands\6\BSR=6
-Bands\6\Start=10000000000
-Bands\6\End=10500000000
-Bands\6\Range=10500
+Bands\5\Name=70 cm
+Bands\6\Num=6
+Bands\6\BSR=1
+Bands\6\Start=144000000
+Bands\6\End=146000000
+Bands\6\Range=146
 Bands\6\MemoryGroup=-1
-Bands\6\Name=3 cm
+Bands\6\Name=2 m
 Bands\size=6
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=1
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=1
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=1
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=1
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=1
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=7
 Modes\7\Reg=7
-Modes\7\BW=1
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=8
 Modes\8\Reg=8
-Modes\8\BW=1
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\9\Num=17
-Modes\9\Reg=23
-Modes\9\BW=0
+Modes\9\Reg=17
 Modes\9\Min=0
 Modes\9\Max=0
 Modes\9\Name=DV
 Modes\10\Num=22
-Modes\10\Reg=34
-Modes\10\BW=0
+Modes\10\Reg=22
 Modes\10\Min=0
 Modes\10\Max=0
 Modes\10\Name=DD
 Modes\11\Num=23
-Modes\11\Reg=35
-Modes\11\BW=0
+Modes\11\Reg=23
 Modes\11\Min=0
 Modes\11\Max=0
 Modes\11\Name=ATV
 Modes\size=11
 Attenuators\1\dB=0
-Attenuators\2\dB=16
+Attenuators\2\dB=10
 Attenuators\size=2
 Preamps\1\Num=0
 Preamps\1\Name=OFF
@@ -758,13 +747,13 @@ Tuning%20Steps\13\Hz=20000
 Tuning%20Steps\14\Num=9
 Tuning%20Steps\14\Name=25 KHz
 Tuning%20Steps\14\Hz=25000
-Tuning%20Steps\15\Num=16
+Tuning%20Steps\15\Num=10
 Tuning%20Steps\15\Name=50 KHz
 Tuning%20Steps\15\Hz=50000
-Tuning%20Steps\16\Num=17
+Tuning%20Steps\16\Num=11
 Tuning%20Steps\16\Name=100 KHz
 Tuning%20Steps\16\Hz=100000
-Tuning%20Steps\17\Num=18
+Tuning%20Steps\17\Num=12
 Tuning%20Steps\17\Name=250 KHz
 Tuning%20Steps\17\Hz=250000
 Tuning%20Steps\18\Num=0
@@ -772,12 +761,12 @@ Tuning%20Steps\18\Name=1 MHz
 Tuning%20Steps\18\Hz=1000000
 Tuning%20Steps\size=18
 Filters\1\Num=1
-Filters\1\Modes=65535
+Filters\1\Modes=0
 Filters\1\Name=FIL1
 Filters\2\Num=2
-Filters\2\Modes=65535
+Filters\2\Modes=0
 Filters\2\Name=FIL2
 Filters\3\Num=3
-Filters\3\Modes=65535
+Filters\3\Modes=0
 Filters\3\Name=FIL3
 Filters\size=3
diff --git a/rigs/IC-9700.rig b/rigs/IC-9700.rig
index a1b7c73..2d3f9d1 100644
--- a/rigs/IC-9700.rig
+++ b/rigs/IC-9700.rig
@@ -22,245 +22,245 @@ MemStart=1
 MemFormat=%1.1a %2.2b %4.1c %5.5f %10.1g %11.1h %12.1i %13.1j %14.1m %15.3n %18.3o %21.1p %22.2q %24.1r %25.3s %28.8t %36.8u %44.8v %52.16z
 SatMemories=99
 SatFormat=%1.2b %3.5f %8.1g %9.1h %10.1i %11.1l %12.1m %13.3n %16.3o %19.1p %20.2q %22.1r %23.8t %31.8u %39.8v %47.5F %52.1G %53.1H %54.1I %55.1K %56.1M %57.3N %60.3O %63.1P %64.2Q %66.1R %67.8T %75.8U %83.8V %91.16z
-Commands\1\Type=ACC1 Mod Level
-Commands\1\String=\\x1a\\x05\\x01\\x12
+Commands\1\Type=Freq (TRX)
+Commands\1\String=\\x00
 Commands\1\Min=0
-Commands\1\Max=255
+Commands\1\Max=0
 Commands\1\Command29=false
-Commands\2\Type=AF Gain
-Commands\2\String=\\x14\\x01
+Commands\2\Type=Mode (TRX)
+Commands\2\String=\\x01
 Commands\2\Min=0
-Commands\2\Max=255
+Commands\2\Max=0
 Commands\2\Command29=false
-Commands\3\Type=AFC Function
-Commands\3\String=\\x16\\x4a
+Commands\3\Type=Band Edge Freq
+Commands\3\String=\\x02
 Commands\3\Min=0
-Commands\3\Max=1
+Commands\3\Max=0
 Commands\3\Command29=false
-Commands\4\Type=AGC Time Constant
-Commands\4\String=\\x16\\x12
+Commands\4\Type=Freq Get
+Commands\4\String=\\x03
 Commands\4\Min=0
-Commands\4\Max=3
+Commands\4\Max=0
 Commands\4\Command29=false
-Commands\5\Type=ALC Meter
-Commands\5\String=\\x15\\x13
+Commands\5\Type=Mode Get
+Commands\5\String=\\x04
 Commands\5\Min=0
-Commands\5\Max=255
+Commands\5\Max=0
 Commands\5\Command29=false
-Commands\6\Type=Anti-Vox Gain
-Commands\6\String=\\x14\\x17
+Commands\6\Type=Freq Set
+Commands\6\String=\\x05
 Commands\6\Min=0
-Commands\6\Max=255
+Commands\6\Max=0
 Commands\6\Command29=false
-Commands\7\Type=Attenuator Status
-Commands\7\String=\\x11
+Commands\7\Type=Mode Set
+Commands\7\String=\\x06
 Commands\7\Min=0
-Commands\7\Max=16
+Commands\7\Max=0
 Commands\7\Command29=false
-Commands\8\Type=Auto Notch
-Commands\8\String=\\x16\\x41
+Commands\8\Type=VFO A Select
+Commands\8\String=\\x07\\x00
 Commands\8\Min=0
-Commands\8\Max=1
+Commands\8\Max=0
 Commands\8\Command29=false
-Commands\9\Type=Band Edge Freq
-Commands\9\String=\\x02
+Commands\9\Type=VFO B Select
+Commands\9\String=\\x07\\x01
 Commands\9\Min=0
 Commands\9\Max=0
 Commands\9\Command29=false
-Commands\10\Type=Band Stacking Reg
-Commands\10\String=\\x1a\\x01
-Commands\10\Min=1
-Commands\10\Max=11
+Commands\10\Type=VFO Equal AB
+Commands\10\String=\\x07\\xa0
+Commands\10\Min=0
+Commands\10\Max=0
 Commands\10\Command29=false
-Commands\11\Type=Break-In Delay
-Commands\11\String=\\x14\\x0f
+Commands\11\Type=VFO Main Select
+Commands\11\String=\\x07\\xd0
 Commands\11\Min=0
-Commands\11\Max=255
+Commands\11\Max=0
 Commands\11\Command29=false
-Commands\12\Type=Break-In Status
-Commands\12\String=\\x16\\x47
+Commands\12\Type=VFO Sub Select
+Commands\12\String=\\x07\\xd1
 Commands\12\Min=0
-Commands\12\Max=1
+Commands\12\Max=0
 Commands\12\Command29=false
-Commands\13\Type=CIV Transceive
-Commands\13\String=\\x1a\\x05\\x01\\x27
+Commands\13\Type=VFO Main/Sub Band
+Commands\13\String=\\x07\\xd2
 Commands\13\Min=0
 Commands\13\Max=1
 Commands\13\Command29=false
-Commands\14\Type=Command Error FA
-Commands\14\String=\\xfa
+Commands\14\Type=Memory Mode
+Commands\14\String=\\x08
 Commands\14\Min=0
 Commands\14\Max=0
 Commands\14\Command29=false
-Commands\15\Type=Command OK FB
-Commands\15\String=\\xfb
+Commands\15\Type=Scanning
+Commands\15\String=\\x0e
 Commands\15\Min=0
 Commands\15\Max=0
 Commands\15\Command29=false
-Commands\16\Type=Comp Meter
-Commands\16\String=\\x15\\x14
+Commands\16\Type=Split/Duplex
+Commands\16\String=\\x0f
 Commands\16\Min=0
-Commands\16\Max=255
+Commands\16\Max=0
 Commands\16\Command29=false
-Commands\17\Type=Compressor Level
-Commands\17\String=\\x14\\x0e
+Commands\17\Type=Tuning Step
+Commands\17\String=\\x10
 Commands\17\Min=0
-Commands\17\Max=255
+Commands\17\Max=0
 Commands\17\Command29=false
-Commands\18\Type=Compressor Status
-Commands\18\String=\\x16\\x44
+Commands\18\Type=Attenuator Status
+Commands\18\String=\\x11
 Commands\18\Min=0
-Commands\18\Max=1
+Commands\18\Max=10
 Commands\18\Command29=false
-Commands\19\Type=CSQL Code
-Commands\19\String=\\x1b\\x07
+Commands\19\Type=Speech
+Commands\19\String=\\x13
 Commands\19\Min=0
-Commands\19\Max=99
+Commands\19\Max=2
 Commands\19\Command29=false
-Commands\20\Type=CW Pitch
-Commands\20\String=\\x14\\x09
+Commands\20\Type=AF Gain
+Commands\20\String=\\x14\\x01
 Commands\20\Min=0
-Commands\20\Max=255
+Commands\20\Max=0
 Commands\20\Command29=false
-Commands\21\Type=Dash Ratio
-Commands\21\String=\\x1a\\x05\\x02\\x24
-Commands\21\Min=28
-Commands\21\Max=45
+Commands\21\Type=RF Gain
+Commands\21\String=\\x14\\x02
+Commands\21\Min=0
+Commands\21\Max=0
 Commands\21\Command29=false
-Commands\22\Type=Data Mode Filter
-Commands\22\String=\\x1a\\x06
+Commands\22\Type=Squelch
+Commands\22\String=\\x14\\x03
 Commands\22\Min=0
 Commands\22\Max=0
 Commands\22\Command29=false
-Commands\23\Type=Data Off Mod Input
-Commands\23\String=\\x1a\\x05\\x01\\x15
+Commands\23\Type=NR Level
+Commands\23\String=\\x14\\x06
 Commands\23\Min=0
-Commands\23\Max=5
+Commands\23\Max=0
 Commands\23\Command29=false
-Commands\24\Type=DATA1 Mod Input
-Commands\24\String=\\x1a\\x05\\x01\\x16
+Commands\24\Type=PBT Inner
+Commands\24\String=\\x14\\x07
 Commands\24\Min=0
-Commands\24\Max=5
+Commands\24\Max=0
 Commands\24\Command29=false
-Commands\25\Type=Dial Lock Status
-Commands\25\String=\\x16\\x50
+Commands\25\Type=PBT Outer
+Commands\25\String=\\x14\\x08
 Commands\25\Min=0
-Commands\25\Max=1
+Commands\25\Max=0
 Commands\25\Command29=false
-Commands\26\Type=DSP IF Filter
-Commands\26\String=\\x16\\x56
+Commands\26\Type=CW Pitch
+Commands\26\String=\\x14\\x09
 Commands\26\Min=0
-Commands\26\Max=1
+Commands\26\Max=0
 Commands\26\Command29=false
-Commands\27\Type=DTCS Code/Polarity
-Commands\27\String=\\x1b\\x02
-Commands\27\Min=23
-Commands\27\Max=754
+Commands\27\Type=RF Power
+Commands\27\String=\\x14\\x0a
+Commands\27\Min=0
+Commands\27\Max=0
 Commands\27\Command29=false
-Commands\28\Type=Filter Width
-Commands\28\String=\\x1a\\x03
+Commands\28\Type=Mic Gain
+Commands\28\String=\\x14\\x0b
 Commands\28\Min=0
-Commands\28\Max=10000
+Commands\28\Max=0
 Commands\28\Command29=false
-Commands\29\Type=Freq (TRX)
-Commands\29\String=\\x00
+Commands\29\Type=Key Speed
+Commands\29\String=\\x14\\x0c
 Commands\29\Min=0
 Commands\29\Max=0
 Commands\29\Command29=false
-Commands\30\Type=Freq Get
-Commands\30\String=\\x03
+Commands\30\Type=Manual Notch Width
+Commands\30\String=\\x14\\x0d
 Commands\30\Min=0
 Commands\30\Max=0
 Commands\30\Command29=false
-Commands\31\Type=Freq Set
-Commands\31\String=\\x05
+Commands\31\Type=Compressor Level
+Commands\31\String=\\x14\\x0e
 Commands\31\Min=0
 Commands\31\Max=0
 Commands\31\Command29=false
-Commands\32\Type=GPS Position
-Commands\32\String=\\x23\\x00
+Commands\32\Type=Break-In Delay
+Commands\32\String=\\x14\\x0f
 Commands\32\Min=0
 Commands\32\Max=0
 Commands\32\Command29=false
-Commands\33\Type=GPS TX Mode
-Commands\33\String=\\x16\\x5c
+Commands\33\Type=NB Level
+Commands\33\String=\\x14\\x12
 Commands\33\Min=0
-Commands\33\Max=1
+Commands\33\Max=0
 Commands\33\Command29=false
-Commands\34\Type=Id Meter
-Commands\34\String=\\x15\\x16
+Commands\34\Type=Monitor Gain
+Commands\34\String=\\x14\\x15
 Commands\34\Min=0
-Commands\34\Max=255
+Commands\34\Max=0
 Commands\34\Command29=false
-Commands\35\Type=IP Plus Status
-Commands\35\String=\\x16\\x65
+Commands\35\Type=Vox Gain
+Commands\35\String=\\x14\\x16
 Commands\35\Min=0
-Commands\35\Max=1
+Commands\35\Max=0
 Commands\35\Command29=false
-Commands\36\Type=Key Speed
-Commands\36\String=\\x14\\x0c
+Commands\36\Type=Anti-Vox Gain
+Commands\36\String=\\x14\\x17
 Commands\36\Min=0
-Commands\36\Max=255
+Commands\36\Max=0
 Commands\36\Command29=false
-Commands\37\Type=LAN Mod Level
-Commands\37\String=\\x1a\\x05\\x01\\x14
+Commands\37\Type=S Meter Sql Status
+Commands\37\String=\\x15\\x01
 Commands\37\Min=0
-Commands\37\Max=255
+Commands\37\Max=0
 Commands\37\Command29=false
-Commands\38\Type=Manual Notch
-Commands\38\String=\\x16\\x48
+Commands\38\Type=S Meter
+Commands\38\String=\\x15\\x02
 Commands\38\Min=0
-Commands\38\Max=1
+Commands\38\Max=0
 Commands\38\Command29=false
-Commands\39\Type=Manual Notch Width
-Commands\39\String=\\x14\\x0d
+Commands\39\Type=Various Squelch
+Commands\39\String=\\x15\\x05
 Commands\39\Min=0
-Commands\39\Max=255
+Commands\39\Max=0
 Commands\39\Command29=false
-Commands\40\Type=Memory Contents
-Commands\40\String=\\x1a\\x00
+Commands\40\Type=Overflow Status
+Commands\40\String=\\x15\\x07
 Commands\40\Min=0
-Commands\40\Max=107
+Commands\40\Max=1
 Commands\40\Command29=false
-Commands\41\Type=Memory Mode
-Commands\41\String=\\x08
+Commands\41\Type=Power Meter
+Commands\41\String=\\x15\\x11
 Commands\41\Min=0
-Commands\41\Max=107
+Commands\41\Max=0
 Commands\41\Command29=false
-Commands\42\Type=Mic Gain
-Commands\42\String=\\x14\\x0b
+Commands\42\Type=SWR Meter
+Commands\42\String=\\x15\\x12
 Commands\42\Min=0
-Commands\42\Max=255
+Commands\42\Max=0
 Commands\42\Command29=false
-Commands\43\Type=Mode (TRX)
-Commands\43\String=\\x01
+Commands\43\Type=ALC Meter
+Commands\43\String=\\x15\\x13
 Commands\43\Min=0
 Commands\43\Max=0
 Commands\43\Command29=false
-Commands\44\Type=Mode Get
-Commands\44\String=\\x04
+Commands\44\Type=Comp Meter
+Commands\44\String=\\x15\\x14
 Commands\44\Min=0
 Commands\44\Max=0
 Commands\44\Command29=false
-Commands\45\Type=Mode Set
-Commands\45\String=\\x06
+Commands\45\Type=Vd Meter
+Commands\45\String=\\x15\\x15
 Commands\45\Min=0
 Commands\45\Max=0
 Commands\45\Command29=false
-Commands\46\Type=Monitor Gain
-Commands\46\String=\\x14\\x15
+Commands\46\Type=Id Meter
+Commands\46\String=\\x15\\x16
 Commands\46\Min=0
-Commands\46\Max=255
+Commands\46\Max=0
 Commands\46\Command29=false
-Commands\47\Type=Monitor Status
-Commands\47\String=\\x16\\x45
+Commands\47\Type=Preamp Status
+Commands\47\String=\\x16\\x02
 Commands\47\Min=0
-Commands\47\Max=1
+Commands\47\Max=3
 Commands\47\Command29=false
-Commands\48\Type=NB Level
-Commands\48\String=\\x14\\x12
+Commands\48\Type=AGC Time Constant
+Commands\48\String=\\x16\\x12
 Commands\48\Min=0
-Commands\48\Max=255
+Commands\48\Max=3
 Commands\48\Command29=false
 Commands\49\Type=Noise Blanker
 Commands\49\String=\\x16\\x22
@@ -272,365 +272,365 @@ Commands\50\String=\\x16\\x40
 Commands\50\Min=0
 Commands\50\Max=1
 Commands\50\Command29=false
-Commands\51\Type=NR Level
-Commands\51\String=\\x14\\x06
+Commands\51\Type=Auto Notch
+Commands\51\String=\\x16\\x41
 Commands\51\Min=0
-Commands\51\Max=255
+Commands\51\Max=1
 Commands\51\Command29=false
-Commands\52\Type=Overflow Status
-Commands\52\String=\\x15\\x07
+Commands\52\Type=Repeater Tone
+Commands\52\String=\\x16\\x42
 Commands\52\Min=0
 Commands\52\Max=1
 Commands\52\Command29=false
-Commands\53\Type=PBT Inner
-Commands\53\String=\\x14\\x07
+Commands\53\Type=Repeater TSQL
+Commands\53\String=\\x16\\x43
 Commands\53\Min=0
-Commands\53\Max=255
+Commands\53\Max=1
 Commands\53\Command29=false
-Commands\54\Type=PBT Outer
-Commands\54\String=\\x14\\x08
+Commands\54\Type=Compressor Status
+Commands\54\String=\\x16\\x44
 Commands\54\Min=0
-Commands\54\Max=255
+Commands\54\Max=1
 Commands\54\Command29=false
-Commands\55\Type=Power Control
-Commands\55\String=\\x18
+Commands\55\Type=Monitor Status
+Commands\55\String=\\x16\\x45
 Commands\55\Min=0
 Commands\55\Max=1
 Commands\55\Command29=false
-Commands\56\Type=Power Meter
-Commands\56\String=\\x15\\x11
+Commands\56\Type=Vox Status
+Commands\56\String=\\x16\\x46
 Commands\56\Min=0
-Commands\56\Max=255
+Commands\56\Max=1
 Commands\56\Command29=false
-Commands\57\Type=Preamp Status
-Commands\57\String=\\x16\\x02
+Commands\57\Type=Break-In Status
+Commands\57\String=\\x16\\x47
 Commands\57\Min=0
-Commands\57\Max=3
+Commands\57\Max=1
 Commands\57\Command29=false
-Commands\58\Type=Quick Split
-Commands\58\String=\\x1a\\x05\\x00\\x43
+Commands\58\Type=Manual Notch
+Commands\58\String=\\x16\\x48
 Commands\58\Min=0
 Commands\58\Max=1
 Commands\58\Command29=false
-Commands\59\Type=Read TX Freq
-Commands\59\String=\\x1c\\x03
+Commands\59\Type=AFC Function
+Commands\59\String=\\x16\\x4a
 Commands\59\Min=0
 Commands\59\Max=1
 Commands\59\Command29=false
-Commands\60\Type=REF Adjust
-Commands\60\String=\\x1a\\x05\\x00\\x72
+Commands\60\Type=Repeater DTCS
+Commands\60\String=\\x16\\x4b
 Commands\60\Min=0
-Commands\60\Max=255
+Commands\60\Max=1
 Commands\60\Command29=false
-Commands\61\Type=REF Adjust Fine
-Commands\61\String=\\x1a\\x05\\x00\\x73
+Commands\61\Type=Twin Peak Filter
+Commands\61\String=\\x16\\x4f
 Commands\61\Min=0
-Commands\61\Max=255
+Commands\61\Max=1
 Commands\61\Command29=false
-Commands\62\Type=Repeater CSQL
-Commands\62\String=\\x16\\x5b
+Commands\62\Type=Dial Lock Status
+Commands\62\String=\\x16\\x50
 Commands\62\Min=0
-Commands\62\Max=2
+Commands\62\Max=1
 Commands\62\Command29=false
-Commands\63\Type=Repeater DTCS
-Commands\63\String=\\x16\\x4b
+Commands\63\Type=DSP IF Filter
+Commands\63\String=\\x16\\x56
 Commands\63\Min=0
 Commands\63\Max=1
 Commands\63\Command29=false
-Commands\64\Type=Repeater Tone
-Commands\64\String=\\x16\\x42
+Commands\64\Type=SSB TX Bandwidth
+Commands\64\String=\\x16\\x58
 Commands\64\Min=0
-Commands\64\Max=1
+Commands\64\Max=2
 Commands\64\Command29=false
-Commands\65\Type=Repeater TSQL
-Commands\65\String=\\x16\\x43
+Commands\65\Type=VFO Dual Watch
+Commands\65\String=\\x16\\x59
 Commands\65\Min=0
 Commands\65\Max=1
 Commands\65\Command29=false
-Commands\66\Type=RF Gain
-Commands\66\String=\\x14\\x02
+Commands\66\Type=Repeater CSQL
+Commands\66\String=\\x16\\x5b
 Commands\66\Min=0
-Commands\66\Max=255
+Commands\66\Max=2
 Commands\66\Command29=false
-Commands\67\Type=RF Power
-Commands\67\String=\\x14\\x0a
+Commands\67\Type=GPS TX Mode
+Commands\67\String=\\x16\\x5c
 Commands\67\Min=0
-Commands\67\Max=255
+Commands\67\Max=1
 Commands\67\Command29=false
-Commands\68\Type=RIT Frequency
-Commands\68\String=\\x21\\x00
-Commands\68\Min=-9999
-Commands\68\Max=9999
+Commands\68\Type=Tone Squelch Type
+Commands\68\String=\\x16\\x5d
+Commands\68\Min=0
+Commands\68\Max=9
 Commands\68\Command29=false
-Commands\69\Type=RIT Status
-Commands\69\String=\\x21\\x01
+Commands\69\Type=IP Plus Status
+Commands\69\String=\\x16\\x65
 Commands\69\Min=0
 Commands\69\Max=1
 Commands\69\Command29=false
-Commands\70\Type=S Meter
-Commands\70\String=\\x15\\x02
+Commands\70\Type=Satellite Mode
+Commands\70\String=\\x16\\z5a
 Commands\70\Min=0
-Commands\70\Max=255
+Commands\70\Max=1
 Commands\70\Command29=false
-Commands\71\Type=S Meter Sql Status
-Commands\71\String=\\x15\\x01
+Commands\71\Type=Send CW
+Commands\71\String=\\x17
 Commands\71\Min=0
-Commands\71\Max=255
+Commands\71\Max=0
 Commands\71\Command29=false
-Commands\72\Type=Satellite Memory
-Commands\72\String=\\x1a\\x07
+Commands\72\Type=Power Control
+Commands\72\String=\\x18
 Commands\72\Min=0
-Commands\72\Max=99
+Commands\72\Max=1
 Commands\72\Command29=false
-Commands\73\Type=Satellite Mode
-Commands\73\String=\\x16\\z5a
+Commands\73\Type=Transceiver ID
+Commands\73\String=\\x19
 Commands\73\Min=0
-Commands\73\Max=1
+Commands\73\Max=0
 Commands\73\Command29=false
-Commands\74\Type=Scanning
-Commands\74\String=\\x0e
+Commands\74\Type=Memory Contents
+Commands\74\String=\\x1a\\x00
 Commands\74\Min=0
-Commands\74\Max=255
+Commands\74\Max=0
 Commands\74\Command29=false
-Commands\75\Type=Scope Center Type
-Commands\75\String=\\x27\\x1c
-Commands\75\Min=0
-Commands\75\Max=2
+Commands\75\Type=Band Stacking Reg
+Commands\75\String=\\x1a\\x01
+Commands\75\Min=1
+Commands\75\Max=0
 Commands\75\Command29=false
-Commands\76\Type=Scope Data Output
-Commands\76\String=\\x27\\x11
+Commands\76\Type=Filter Width
+Commands\76\String=\\x1a\\x03
 Commands\76\Min=0
-Commands\76\Max=1
+Commands\76\Max=2710
 Commands\76\Command29=false
-Commands\77\Type=Scope During TX
-Commands\77\String=\\x27\\x1b
+Commands\77\Type=Quick Split
+Commands\77\String=\\x1a\\x05\\x00\\x43
 Commands\77\Min=0
 Commands\77\Max=1
 Commands\77\Command29=false
-Commands\78\Type=Scope Fixed Freq
-Commands\78\String=\\x27\\x1e
-Commands\78\Min=1
-Commands\78\Max=12
+Commands\78\Type=REF Adjust
+Commands\78\String=\\x1a\\x05\\x00\\x72
+Commands\78\Min=0
+Commands\78\Max=0
 Commands\78\Command29=false
-Commands\79\Type=Scope Main Edge
-Commands\79\String=\\x27\\x16\\x00
-Commands\79\Min=1
-Commands\79\Max=4
+Commands\79\Type=REF Adjust Fine
+Commands\79\String=\\x1a\\x05\\x00\\x73
+Commands\79\Min=0
+Commands\79\Max=0
 Commands\79\Command29=false
-Commands\80\Type=Scope Main Edge
-Commands\80\String=\\x27\\x17\\x00
+Commands\80\Type=ACC1 Mod Level
+Commands\80\String=\\x1a\\x05\\x01\\x12
 Commands\80\Min=0
-Commands\80\Max=1
+Commands\80\Max=0
 Commands\80\Command29=false
-Commands\81\Type=Scope Main Mode
-Commands\81\String=\\x27\\x14\\x00
+Commands\81\Type=USB Mod Level
+Commands\81\String=\\x1a\\x05\\x01\\x13
 Commands\81\Min=0
 Commands\81\Max=0
 Commands\81\Command29=false
-Commands\82\Type=Scope Main Ref
-Commands\82\String=\\x27\\x19\\x00
-Commands\82\Min=-30
-Commands\82\Max=10
+Commands\82\Type=LAN Mod Level
+Commands\82\String=\\x1a\\x05\\x01\\x14
+Commands\82\Min=0
+Commands\82\Max=0
 Commands\82\Command29=false
-Commands\83\Type=Scope Main Span
-Commands\83\String=\\x27\\x15\\x00
+Commands\83\Type=Data Off Mod Input
+Commands\83\String=\\x1a\\x05\\x01\\x15
 Commands\83\Min=0
-Commands\83\Max=7
+Commands\83\Max=5
 Commands\83\Command29=false
-Commands\84\Type=Scope Main Speed
-Commands\84\String=\\x27\\x1a\\x00
+Commands\84\Type=DATA1 Mod Input
+Commands\84\String=\\x1a\\x05\\x01\\x16
 Commands\84\Min=0
-Commands\84\Max=2
+Commands\84\Max=5
 Commands\84\Command29=false
-Commands\85\Type=Scope Main VBW
-Commands\85\String=\\x27\\x1d\\x00
+Commands\85\Type=CIV Transceive
+Commands\85\String=\\x1a\\x05\\x01\\x27
 Commands\85\Min=0
 Commands\85\Max=1
 Commands\85\Command29=false
-Commands\86\Type=Scope Main Wave Data
-Commands\86\String=\\x27\\x00\\x00
+Commands\86\Type=System Date
+Commands\86\String=\\x1a\\x05\\x01\\x79
 Commands\86\Min=0
 Commands\86\Max=0
 Commands\86\Command29=false
-Commands\87\Type=Scope Main/Sub
-Commands\87\String=\\x27\\x12
+Commands\87\Type=System Time
+Commands\87\String=\\x1a\\x05\\x01\\x80
 Commands\87\Min=0
-Commands\87\Max=1
+Commands\87\Max=0
 Commands\87\Command29=false
-Commands\88\Type=Scope On/Off
-Commands\88\String=\\x27\\x10
+Commands\88\Type=UTC Offset
+Commands\88\String=\\x1a\\x05\\x01\\x84
 Commands\88\Min=0
-Commands\88\Max=1
+Commands\88\Max=0
 Commands\88\Command29=false
-Commands\89\Type=Selected Freq
-Commands\89\String=\\x25\\x00
+Commands\89\Type=Dash Ratio
+Commands\89\String=\\x1a\\x05\\x02\\x24
 Commands\89\Min=0
 Commands\89\Max=0
 Commands\89\Command29=false
-Commands\90\Type=Selected Mode
-Commands\90\String=\\x26\\x00
+Commands\90\Type=Data Mode Filter
+Commands\90\String=\\x1a\\x06
 Commands\90\Min=0
 Commands\90\Max=0
 Commands\90\Command29=false
-Commands\91\Type=Send CW
-Commands\91\String=\\x17
+Commands\91\Type=Satellite Memory
+Commands\91\String=\\x1a\\x07
 Commands\91\Min=0
-Commands\91\Max=30
+Commands\91\Max=63
 Commands\91\Command29=false
-Commands\92\Type=Speech
-Commands\92\String=\\x13
-Commands\92\Min=0
-Commands\92\Max=2
+Commands\92\Type=Tone Frequency
+Commands\92\String=\\x1b\\x00
+Commands\92\Min=43
+Commands\92\Max=0
 Commands\92\Command29=false
-Commands\93\Type=Split/Duplex
-Commands\93\String=\\x0f
-Commands\93\Min=0
-Commands\93\Max=13
+Commands\93\Type=TSQL Frequency
+Commands\93\String=\\x1b\\x01
+Commands\93\Min=43
+Commands\93\Max=0
 Commands\93\Command29=false
-Commands\94\Type=Squelch
-Commands\94\String=\\x14\\x03
-Commands\94\Min=0
-Commands\94\Max=255
+Commands\94\Type=DTCS Code/Polarity
+Commands\94\String=\\x1b\\x02
+Commands\94\Min=17
+Commands\94\Max=0
 Commands\94\Command29=false
-Commands\95\Type=SSB TX Bandwidth
-Commands\95\String=\\x16\\x58
+Commands\95\Type=CSQL Code
+Commands\95\String=\\x1b\\x07
 Commands\95\Min=0
-Commands\95\Max=2
+Commands\95\Max=63
 Commands\95\Command29=false
-Commands\96\Type=SWR Meter
-Commands\96\String=\\x15\\x12
+Commands\96\Type=Transceiver Status
+Commands\96\String=\\x1c\\x00
 Commands\96\Min=0
-Commands\96\Max=255
+Commands\96\Max=1
 Commands\96\Command29=false
-Commands\97\Type=System Date
-Commands\97\String=\\x1a\\x05\\x01\\x79
+Commands\97\Type=XFC Status
+Commands\97\String=\\x1c\\x02
 Commands\97\Min=0
-Commands\97\Max=0
+Commands\97\Max=1
 Commands\97\Command29=false
-Commands\98\Type=System Time
-Commands\98\String=\\x1a\\x05\\x01\\x80
+Commands\98\Type=Read TX Freq
+Commands\98\String=\\x1c\\x03
 Commands\98\Min=0
-Commands\98\Max=0
+Commands\98\Max=1
 Commands\98\Command29=false
-Commands\99\Type=Tone Frequency
-Commands\99\String=\\x1b\\x00
-Commands\99\Min=67
-Commands\99\Max=2541
+Commands\99\Type=RIT Frequency
+Commands\99\String=\\x21\\x00
+Commands\99\Min=0
+Commands\99\Max=0
 Commands\99\Command29=false
-Commands\100\Type=Tone Squelch Type
-Commands\100\String=\\x16\\x5d
+Commands\100\Type=RIT Status
+Commands\100\String=\\x21\\x01
 Commands\100\Min=0
-Commands\100\Max=9
+Commands\100\Max=1
 Commands\100\Command29=false
-Commands\101\Type=Transceiver ID
-Commands\101\String=\\x19
+Commands\101\Type=GPS Position
+Commands\101\String=\\x23\\x00
 Commands\101\Min=0
 Commands\101\Max=0
 Commands\101\Command29=false
-Commands\102\Type=Transceiver Status
-Commands\102\String=\\x1c\\x00
+Commands\102\Type=Selected Freq
+Commands\102\String=\\x25\\x00
 Commands\102\Min=0
-Commands\102\Max=1
+Commands\102\Max=0
 Commands\102\Command29=false
-Commands\103\Type=TSQL Frequency
-Commands\103\String=\\x1b\\x01
-Commands\103\Min=67
-Commands\103\Max=2541
+Commands\103\Type=Unselected Freq
+Commands\103\String=\\x25\\x01
+Commands\103\Min=0
+Commands\103\Max=0
 Commands\103\Command29=false
-Commands\104\Type=Tuning Step
-Commands\104\String=\\x10
+Commands\104\Type=Selected Mode
+Commands\104\String=\\x26\\x00
 Commands\104\Min=0
-Commands\104\Max=11
+Commands\104\Max=0
 Commands\104\Command29=false
-Commands\105\Type=Twin Peak Filter
-Commands\105\String=\\x16\\x4f
+Commands\105\Type=Unselected Mode
+Commands\105\String=\\x26\\x01
 Commands\105\Min=0
-Commands\105\Max=1
+Commands\105\Max=0
 Commands\105\Command29=false
-Commands\106\Type=Unselected Freq
-Commands\106\String=\\x25\\x01
+Commands\106\Type=Scope Main Wave Data
+Commands\106\String=\\x27\\x00\\x00
 Commands\106\Min=0
 Commands\106\Max=0
 Commands\106\Command29=false
-Commands\107\Type=Unselected Mode
-Commands\107\String=\\x26\\x01
+Commands\107\Type=Scope On/Off
+Commands\107\String=\\x27\\x10
 Commands\107\Min=0
-Commands\107\Max=0
+Commands\107\Max=1
 Commands\107\Command29=false
-Commands\108\Type=USB Mod Level
-Commands\108\String=\\x1a\\x05\\x01\\x13
+Commands\108\Type=Scope Data Output
+Commands\108\String=\\x27\\x11
 Commands\108\Min=0
-Commands\108\Max=255
+Commands\108\Max=1
 Commands\108\Command29=false
-Commands\109\Type=UTC Offset
-Commands\109\String=\\x1a\\x05\\x01\\x84
+Commands\109\Type=Scope Main/Sub
+Commands\109\String=\\x27\\x12
 Commands\109\Min=0
-Commands\109\Max=0
+Commands\109\Max=1
 Commands\109\Command29=false
-Commands\110\Type=Various Squelch
-Commands\110\String=\\x15\\x05
+Commands\110\Type=Scope Main Mode
+Commands\110\String=\\x27\\x14\\x00
 Commands\110\Min=0
-Commands\110\Max=255
+Commands\110\Max=0
 Commands\110\Command29=false
-Commands\111\Type=Vd Meter
-Commands\111\String=\\x15\\x15
+Commands\111\Type=Scope Main Span
+Commands\111\String=\\x27\\x15\\x00
 Commands\111\Min=0
-Commands\111\Max=255
+Commands\111\Max=7
 Commands\111\Command29=false
-Commands\112\Type=VFO A Select
-Commands\112\String=\\x07\\x00
-Commands\112\Min=0
-Commands\112\Max=0
+Commands\112\Type=Scope Main Edge
+Commands\112\String=\\x27\\x16\\x00
+Commands\112\Min=1
+Commands\112\Max=4
 Commands\112\Command29=false
-Commands\113\Type=VFO B Select
-Commands\113\String=\\x07\\x01
+Commands\113\Type=Scope Main Edge
+Commands\113\String=\\x27\\x17\\x00
 Commands\113\Min=0
-Commands\113\Max=0
+Commands\113\Max=1
 Commands\113\Command29=false
-Commands\114\Type=VFO Dual Watch
-Commands\114\String=\\x16\\x59
+Commands\114\Type=Scope Main Ref
+Commands\114\String=\\x27\\x19\\x00
 Commands\114\Min=0
-Commands\114\Max=1
+Commands\114\Max=0
 Commands\114\Command29=false
-Commands\115\Type=VFO Equal AB
-Commands\115\String=\\x07\\xa0
+Commands\115\Type=Scope Main Speed
+Commands\115\String=\\x27\\x1a\\x00
 Commands\115\Min=0
-Commands\115\Max=0
+Commands\115\Max=2
 Commands\115\Command29=false
-Commands\116\Type=VFO Main Select
-Commands\116\String=\\x07\\xd0
+Commands\116\Type=Scope During TX
+Commands\116\String=\\x27\\x1b
 Commands\116\Min=0
-Commands\116\Max=0
+Commands\116\Max=1
 Commands\116\Command29=false
-Commands\117\Type=VFO Main/Sub Band
-Commands\117\String=\\x07\\xd2
+Commands\117\Type=Scope Center Type
+Commands\117\String=\\x27\\x1c
 Commands\117\Min=0
-Commands\117\Max=1
+Commands\117\Max=2
 Commands\117\Command29=false
-Commands\118\Type=VFO Sub Select
-Commands\118\String=\\x07\\xd1
+Commands\118\Type=Scope Main VBW
+Commands\118\String=\\x27\\x1d\\x00
 Commands\118\Min=0
-Commands\118\Max=0
+Commands\118\Max=1
 Commands\118\Command29=false
-Commands\119\Type=Voice TX
-Commands\119\String=\\x28\\x00
-Commands\119\Min=0
-Commands\119\Max=8
+Commands\119\Type=Scope Fixed Freq
+Commands\119\String=\\x27\\x1e
+Commands\119\Min=1
+Commands\119\Max=0
 Commands\119\Command29=false
-Commands\120\Type=Vox Gain
-Commands\120\String=\\x14\\x16
+Commands\120\Type=Voice TX
+Commands\120\String=\\x28\\x00
 Commands\120\Min=0
-Commands\120\Max=255
+Commands\120\Max=8
 Commands\120\Command29=false
-Commands\121\Type=Vox Status
-Commands\121\String=\\x16\\x46
+Commands\121\Type=Command Error FA
+Commands\121\String=\\xfa
 Commands\121\Min=0
-Commands\121\Max=1
+Commands\121\Max=0
 Commands\121\Command29=false
-Commands\122\Type=XFC Status
-Commands\122\String=\\x1c\\x02
+Commands\122\Type=Command OK FB
+Commands\122\String=\\xfb
 Commands\122\Min=0
-Commands\122\Max=1
+Commands\122\Max=0
 Commands\122\Command29=false
 Commands\size=122
 Spans\1\Num=0
@@ -677,13 +677,13 @@ Inputs\6\Num=5
 Inputs\6\Reg=0
 Inputs\6\Name=LAN
 Inputs\size=6
-Bands\1\Num=6
-Bands\1\BSR=1
-Bands\1\Start=144000000
-Bands\1\End=148000000
-Bands\1\Range=148
-Bands\1\MemoryGroup=1
-Bands\1\Name=2m
+Bands\1\Num=4
+Bands\1\BSR=3
+Bands\1\Start=1240000000
+Bands\1\End=1300000000
+Bands\1\Range=1300
+Bands\1\MemoryGroup=3
+Bands\1\Name=23cm
 Bands\2\Num=5
 Bands\2\BSR=2
 Bands\2\Start=430000000
@@ -691,77 +691,67 @@ Bands\2\End=450000000
 Bands\2\Range=450
 Bands\2\MemoryGroup=2
 Bands\2\Name=70cm
-Bands\3\Num=4
-Bands\3\BSR=3
-Bands\3\Start=1240000000
-Bands\3\End=1300000000
-Bands\3\Range=1300
-Bands\3\MemoryGroup=3
-Bands\3\Name=23cm
+Bands\3\Num=6
+Bands\3\BSR=1
+Bands\3\Start=144000000
+Bands\3\End=148000000
+Bands\3\Range=148
+Bands\3\MemoryGroup=1
+Bands\3\Name=2m
 Bands\size=3
 Modes\1\Num=0
 Modes\1\Reg=0
-Modes\1\BW=1
 Modes\1\Min=50
 Modes\1\Max=3600
 Modes\1\Name=LSB
 Modes\2\Num=1
 Modes\2\Reg=1
-Modes\2\BW=1
 Modes\2\Min=50
 Modes\2\Max=3600
 Modes\2\Name=USB
 Modes\3\Num=2
 Modes\3\Reg=2
-Modes\3\BW=1
 Modes\3\Min=200
 Modes\3\Max=10000
 Modes\3\Name=AM
 Modes\4\Num=3
 Modes\4\Reg=3
-Modes\4\BW=1
 Modes\4\Min=50
 Modes\4\Max=3600
 Modes\4\Name=CW
 Modes\5\Num=4
 Modes\5\Reg=4
-Modes\5\BW=1
 Modes\5\Min=50
 Modes\5\Max=2700
 Modes\5\Name=RTTY
 Modes\6\Num=5
 Modes\6\Reg=5
-Modes\6\BW=0
 Modes\6\Min=0
 Modes\6\Max=0
 Modes\6\Name=FM
 Modes\7\Num=6
 Modes\7\Reg=7
-Modes\7\BW=1
 Modes\7\Min=50
 Modes\7\Max=3600
 Modes\7\Name=CW-R
 Modes\8\Num=7
 Modes\8\Reg=8
-Modes\8\BW=1
 Modes\8\Min=50
 Modes\8\Max=2700
 Modes\8\Name=RTTY-R
 Modes\9\Num=12
-Modes\9\Reg=23
-Modes\9\BW=0
+Modes\9\Reg=17
 Modes\9\Min=0
 Modes\9\Max=0
 Modes\9\Name=DV
 Modes\10\Num=14
-Modes\10\Reg=34
-Modes\10\BW=0
+Modes\10\Reg=22
 Modes\10\Min=0
 Modes\10\Max=0
 Modes\10\Name=DD
 Modes\size=10
 Attenuators\1\dB=0
-Attenuators\2\dB=16
+Attenuators\2\dB=10
 Attenuators\size=2
 Preamps\1\Num=0
 Preamps\1\Name=INT/EXT OFF
@@ -818,10 +808,10 @@ Tuning%20Steps\14\Hz=20000
 Tuning%20Steps\15\Num=9
 Tuning%20Steps\15\Name=25 KHz
 Tuning%20Steps\15\Hz=25000
-Tuning%20Steps\16\Num=16
+Tuning%20Steps\16\Num=10
 Tuning%20Steps\16\Name=50 KHz
 Tuning%20Steps\16\Hz=50000
-Tuning%20Steps\17\Num=17
+Tuning%20Steps\17\Num=11
 Tuning%20Steps\17\Name=100 KHz
 Tuning%20Steps\17\Hz=100000
 Tuning%20Steps\18\Num=0
@@ -832,12 +822,12 @@ Tuning%20Steps\19\Name=1 MHz
 Tuning%20Steps\19\Hz=1000000
 Tuning%20Steps\size=19
 Filters\1\Num=1
-Filters\1\Modes=4294967295
+Filters\1\Modes=0
 Filters\1\Name=FIL1
 Filters\2\Num=2
-Filters\2\Modes=4294967295
+Filters\2\Modes=0
 Filters\2\Name=FIL2
 Filters\3\Num=3
-Filters\3\Modes=4294967295
+Filters\3\Modes=0
 Filters\3\Name=FIL3
 Filters\size=3
diff --git a/wfmain.cpp b/wfmain.cpp
index a2c040b..ba4f0d3 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -3800,7 +3800,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
             ui->attSelCombo->setDisabled(false);
             foreach (auto att, rigCaps.attenuators)
             {
-                ui->attSelCombo->addItem(((att == 0) ? QString("0 dB") : QString("-%1 dB").arg(att,2,16)),att);
+                ui->attSelCombo->addItem(((att == 0) ? QString("0 dB") : QString("-%1 dB").arg(att)),att);
             }
         } else {
             ui->attSelCombo->setDisabled(true);