diff --git a/Makefile b/Makefile
index ee71cf5..c1ac82a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ENABLE_OVERLAY                   := 0
 ENABLE_LTO                       := 1
 # UART Programming 2.9 kB
 ENABLE_UART                      := 1
-ENABLE_UART_DEBUG                := 0
+ENABLE_UART_DEBUG                := 1
 # AirCopy 2.5 kB
 ENABLE_AIRCOPY                   := 1
 ENABLE_AIRCOPY_REMEMBER_FREQ     := 1
diff --git a/app/app.c b/app/app.c
index a0d04c0..3989e32 100644
--- a/app/app.c
+++ b/app/app.c
@@ -865,7 +865,7 @@ static bool APP_toggle_dual_watch_vfo(void)
 		return false;
 
 	#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
-		UART_SendText("dual wot\r\n");
+//		UART_SendText("dual wot\r\n");
 	#endif
 
 	#ifdef ENABLE_NOAA
diff --git a/firmware.bin b/firmware.bin
index 3d1cc50..a677562 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index fad6356..15bfaec 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/settings.c b/settings.c
index c87b316..669924e 100644
--- a/settings.c
+++ b/settings.c
@@ -562,6 +562,8 @@ unsigned int SETTINGS_find_channel(const uint32_t frequency)
 			continue;
 		if (freq == frequency)
 			return chan;    // found it
+//		if (abs((int32_t)freq - frequency) < 5)
+//			return chan;    // found a very close match
 	}
 
 	return 0xffffffff;
diff --git a/ui/main.c b/ui/main.c
index 23d3308..792cdca 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -521,7 +521,7 @@ void UI_DisplayMain(void)
 				if (vfo_num == main_vfo_num)
 					memcpy(p_line0 + 0, BITMAP_VFO_DEFAULT, sizeof(BITMAP_VFO_DEFAULT));
 				else
-				//if (g_eeprom.config.setting.cross_vfo != CROSS_BAND_OFF)
+				if (g_eeprom.config.setting.cross_vfo != CROSS_BAND_OFF || vfo_num == current_vfo_num)
 					memcpy(p_line0 + 0, BITMAP_VFO_NOT_DEFAULT, sizeof(BITMAP_VFO_NOT_DEFAULT));
 			}
 		}
@@ -531,7 +531,7 @@ void UI_DisplayMain(void)
 			if (vfo_num == main_vfo_num)
 				memcpy(p_line0 + 0, BITMAP_VFO_DEFAULT, sizeof(BITMAP_VFO_DEFAULT));
 			else
-			//if (g_eeprom.config.setting.cross_vfo != CROSS_BAND_OFF)
+			if (g_eeprom.config.setting.cross_vfo != CROSS_BAND_OFF || vfo_num == current_vfo_num)
 				memcpy(p_line0 + 0, BITMAP_VFO_NOT_DEFAULT, sizeof(BITMAP_VFO_NOT_DEFAULT));
 		}