diff --git a/Makefile b/Makefile
index 6971f4b..3074bac 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@
 #
 ENABLE_SWD                    := 0
 ENABLE_OVERLAY                := 0
-ENABLE_LTO                    := 0
+ENABLE_LTO                    := 1
 ENABLE_UART                   := 1
 ENABLE_AIRCOPY                := 0
-ENABLE_FMRADIO                := 1
+ENABLE_FMRADIO                := 0
 ENABLE_NOAA                   := 0
 ENABLE_VOICE                  := 0
 ENABLE_ALARM                  := 0
@@ -21,7 +21,7 @@ ENABLE_TX_WHEN_AM             := 0
 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
 ENABLE_MAIN_KEY_HOLD          := 1
 ENABLE_BOOT_BEEPS             := 0
-ENABLE_COMPANDER              := 1
+ENABLE_COMPANDER              := 0
 ENABLE_SHOW_CHARGE_LEVEL      := 0
 ENABLE_REVERSE_BAT_SYMBOL     := 1
 ENABLE_CODE_SCAN_TIMEOUT      := 0
diff --git a/am_fix.c b/am_fix.c
index 61a3cf8..ad8ef0a 100644
--- a/am_fix.c
+++ b/am_fix.c
@@ -438,7 +438,7 @@ const uint8_t orig_pga       = 6;   //  -3dB
 			}
 		}
 
-		if (diff_dB >= -3)                    // 3dB hysterisis (help reduce gain hunting)
+		if (diff_dB >= -6)                    // 6dB hysterisis (help reduce gain hunting)
 			hold_counter[vfo] = 30;           // 300ms hold
 
 		if (hold_counter[vfo] == 0)
diff --git a/firmware.bin b/firmware.bin
index 5bfecc0..e2dd0a2 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 5d3c9c4..987a663 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/misc.c b/misc.c
index a54fcec..10a2580 100644
--- a/misc.c
+++ b/misc.c
@@ -193,7 +193,7 @@ uint8_t           gRestoreMrChannel;
 uint8_t           gCurrentScanList;
 uint8_t           gPreviousMrChannel;
 uint32_t          gRestoreFrequency;
-uint8_t           gRxVfoIsActive;
+bool              gRxVfoIsActive;
 #ifdef ENABLE_ALARM
 	uint8_t       gAlarmToneCounter;
 	uint16_t      gAlarmRunningCounter;
diff --git a/misc.h b/misc.h
index c216898..0f343ca 100644
--- a/misc.h
+++ b/misc.h
@@ -257,7 +257,7 @@ extern uint8_t               gRestoreMrChannel;
 extern uint8_t               gCurrentScanList;
 extern uint8_t               gPreviousMrChannel;
 extern uint32_t              gRestoreFrequency;
-extern uint8_t               gRxVfoIsActive;
+extern bool                  gRxVfoIsActive;
 extern uint8_t               gAlarmToneCounter;
 extern uint16_t              gAlarmRunningCounter;
 extern bool                  gKeyBeingHeld;
diff --git a/radio.c b/radio.c
index 39624f8..8eca729 100644
--- a/radio.c
+++ b/radio.c
@@ -915,7 +915,7 @@ void RADIO_PrepareTX(void)
 		gDualWatchCountdown_10ms = dual_watch_count_after_tx_10ms;
 		gScheduleDualWatch       = false;
 
-		if (gRxVfoIsActive)
+		if (!gRxVfoIsActive)
 		{	// use the TX vfo
 			gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL;
 			gRxVfo             = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
@@ -954,8 +954,7 @@ void RADIO_PrepareTX(void)
 		}
 		else
 		//if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0 || gCurrentVfo->CHANNEL_SAVE <= FREQ_CHANNEL_LAST)
-		//if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0)
-		if (TX_freq_check(gEeprom.VfoInfo[gEeprom.TX_CHANNEL].pTX->Frequency) == 0)
+		if (TX_freq_check(gCurrentVfo->pTX->Frequency) == 0)
 		{	// TX frequency is allowed
 			if (gCurrentVfo->BUSY_CHANNEL_LOCK && gCurrentFunction == FUNCTION_RECEIVE)
 				State = VFO_STATE_BUSY;          // busy RX'ing a station
diff --git a/ui/menu.c b/ui/menu.c
index 664875c..777cc52 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -420,11 +420,7 @@ void UI_DisplayMenu(void)
 		{	// current menu item
 			strcpy(String, MenuList[menu_index].name);
 //			strcat(String, ":");
-			UI_PrintStringSmall(String, 0, 0, 6);
-			
-			// invert pixels
-//			for (i = 0; i < (7 * strlen(String)); i++)
-//				gFrameBuffer[6][i] ^= 0xFF;
+			UI_PrintStringSmall(String, 0, 0, 0);
 		}
 	}
 	#endif