diff --git a/ubitx_menu.ino b/ubitx_menu.ino
index ab278b5..3adf08a 100644
--- a/ubitx_menu.ino
+++ b/ubitx_menu.ino
@@ -196,19 +196,25 @@ void menuSidebandToggle(int btn){
       printLine2("LSB \x7E USB");
   }
   else {
-      if (isUSB == true){
-        isUSB = false;
-        printLine2("LSB Selected");
-        active_delay(500);
-        printLine2("");
-      }
-      else {
-        isUSB = true;
-        printLine2("USB Selected");
-        active_delay(500);
-        printLine2("");
-      }
-    
+    if (isUSB == true){
+      isUSB = false;
+      printLine2("LSB Selected");
+      active_delay(500);
+      printLine2("");
+    }
+    else {
+      isUSB = true;
+      printLine2("USB Selected");
+      active_delay(500);
+      printLine2("");
+    }
+    //Added by KD8CEC
+    if (vfoActive == VFO_B){
+      isUsbVfoB = isUSB;
+    }
+    else {
+      isUsbVfoB = isUSB;
+    }
     updateDisplay();
     menuOn = 0;
   }
@@ -224,17 +230,18 @@ void menuSplitToggle(int btn){
       printLine2("Split On \x7E Off");
   }
   else {
-      if (splitOn == 1){
-        splitOn = 0;
-        printLine2("Split ON");
-      }
-      else {
-        splitOn = 1;
-        if (ritOn == 1)
-          ritOn = 0;
-        printLine2("Split Off");
-      }
+    if (splitOn == 1){
+      splitOn = 0;
+      printLine2("Split ON");
+    }
+    else {
+      splitOn = 1;
+      if (ritOn == 1)
+        ritOn = 0;
+      printLine2("Split Off");
+    }
     active_delay(500);
+    printLine2("");
     updateDisplay();
     menuOn = 0;
   }
@@ -506,7 +513,7 @@ void menuSetupCwTone(int btn){
   tone(CW_TONE, sideTone);
 
   //disable all clock 1 and clock 2 
-  while (digitalRead(PTT) == HIGH || !btnDown())
+  while (digitalRead(PTT) == HIGH && !btnDown())
   {
     knob = enc_read();
 
@@ -616,6 +623,11 @@ void menuSetupKeyer(int btn){
   printLine1("Keyer Set!");
   active_delay(600);
   printLine1("");
+
+  //Added KD8CEC
+  printLine2("");
+  updateDisplay(); 
+  menuOn = 0;  
 }
 
 void menuReadADC(int btn){
diff --git a/ubitx_v4.3_code.ino b/ubitx_v4.3_code.ino
index cc5cdc2..b074211 100644
--- a/ubitx_v4.3_code.ino
+++ b/ubitx_v4.3_code.ino
@@ -1,4 +1,4 @@
- /**
+  /**
  * This source file is under General Public License version 3.
  * 
  * This verision uses a built-in Si5351 library
@@ -337,7 +337,7 @@ void startTx(byte txMode){
       else if (vfoActive == VFO_A){
         vfoActive = VFO_B;
         frequency = vfoB;
-        isUSB = isUsbVfoA;        
+        isUSB = isUsbVfoB;        
       }
     }
     setFrequency(frequency);