diff --git a/driver/bk4819.c b/driver/bk4819.c
index d2007a1..54c964e 100644
--- a/driver/bk4819.c
+++ b/driver/bk4819.c
@@ -476,7 +476,7 @@ void BK4819_SetFilterBandwidth(const BK4819_filter_bandwidth_t Bandwidth)
 				(0u << 15) |     // 0
 				(4u << 12) |     // 3 RF filter bandwidth
 				(2u <<  9) |     // 0 RF filter bandwidth when signal is weak
-				(3u <<  6) |     // 0 AF-TX-LPF-2 filter band width
+				(4u <<  6) |     // 0 AF-TX-LPF-2 filter band width
 				(2u <<  4) |     // 2 BW Mode Selection
 				(1u <<  3) |     // 1
 				(0u <<  2) |     // 0 Gain after FM Demodulation
@@ -488,7 +488,7 @@ void BK4819_SetFilterBandwidth(const BK4819_filter_bandwidth_t Bandwidth)
 				(0u << 15) |     // 0
 				(4u << 12) |     // 4 RF filter bandwidth
 				(2u <<  9) |     // 0 RF filter bandwidth when signal is weak
-				(2u <<  6) |     // 1 AF-TX-LPF-2 filter Band Width
+				(6u <<  6) |     // 1 AF-TX-LPF-2 filter Band Width
 				(0u <<  4) |     // 0 BW Mode Selection
 				(1u <<  3) |     // 1
 				(0u <<  2) |     // 0 Gain after FM Demodulation
diff --git a/firmware.bin b/firmware.bin
index c5e89b0..85e6897 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index bccda9c..7982c13 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/panadapter.c b/panadapter.c
index 6cdcaac..0517293 100644
--- a/panadapter.c
+++ b/panadapter.c
@@ -142,11 +142,9 @@ void PAN_process_10ms(void)
 	     g_monitor_enabled                          ||
 	     g_current_function == FUNCTION_POWER_SAVE  ||
 	     g_current_display_screen == DISPLAY_SEARCH ||
-	     g_css_scan_mode  != CSS_SCAN_MODE_OFF      ||
-	     g_scan_state_dir != SCAN_STATE_DIR_OFF     ||
-		 g_dtmf_call_state != DTMF_CALL_STATE_NONE) //  ||
-//	     g_dtmf_is_tx                               ||
-//	     g_dtmf_input_mode)
+	     g_css_scan_mode   != CSS_SCAN_MODE_OFF     ||
+	     g_scan_state_dir  != SCAN_STATE_DIR_OFF    ||
+		 g_dtmf_call_state != DTMF_CALL_STATE_NONE)
 	{
 		if (g_panadapter_enabled)
 		{	// disable the panadapter
@@ -196,16 +194,13 @@ void PAN_process_10ms(void)
 
 		if (g_panadapter_vfo_tick > 0)
 		{
-			if (panadapter_delay > 0)
-			{	// update the screen every 200ms
-				if (--panadapter_delay == 0)
-				{
-					panadapter_delay = 20;
-					if (!g_dtmf_input_mode)
-						UI_DisplayMain_pan(true);
-					else
-						g_update_display = true;
-				}
+			if (--panadapter_delay <= 0)
+			{	// update the screen every 200ms while on the VFO/center frequency
+				panadapter_delay = 20;
+				if (!g_dtmf_input_mode)
+					UI_DisplayMain_pan(true);
+				//else
+				//	g_update_display = true;
 			}
 			return;
 		}
@@ -217,11 +212,10 @@ void PAN_process_10ms(void)
 
 	// scanning/sweeping
 
-	if (panadapter_delay > 0)
-	{	// let the VCO/PLL/RSSI settle before sampling the RSSI
-		panadapter_delay--;
+	// let the VCO/PLL/RSSI settle before sampling the RSSI
+	if (--panadapter_delay >= 0)
 		return;
-	}
+	panadapter_delay = 0;
 
 	// save the current RSSI value into the panadapter
 	const uint16_t rssi = BK4819_GetRSSI();
@@ -262,6 +256,6 @@ void PAN_process_10ms(void)
 
 	if (!g_dtmf_input_mode)
 		UI_DisplayMain_pan(true);
-	else
-		g_update_display = true;
+//	else
+//		g_update_display = true;
 }
diff --git a/radio.c b/radio.c
index 614e4ac..78a3dac 100644
--- a/radio.c
+++ b/radio.c
@@ -560,7 +560,7 @@ void RADIO_ConfigureSquelch(vfo_info_t *p_vfo)
 
 void RADIO_ConfigureTXPower(vfo_info_t *p_vfo)
 {
-	// my calibration data
+	// my eeprom calibration data
 	//
 	// 1ED0    32 32 32   64 64 64   8C 8C 8C   FF FF FF FF FF FF FF ..  50 MHz
 	// 1EE0    32 32 32   64 64 64   8C 8C 8C   FF FF FF FF FF FF FF .. 108 MHz
@@ -593,6 +593,7 @@ void RADIO_ConfigureTXPower(vfo_info_t *p_vfo)
 		}
 	#endif
 
+	// set the TX power registers
 	p_vfo->txp_calculated_setting = FREQUENCY_CalculateOutputPower(
 		tx_power[0],
 		tx_power[1],
diff --git a/ui/main.c b/ui/main.c
index eaa5aac..2091534 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -404,12 +404,13 @@ void big_freq(const uint32_t frequency, const unsigned int x, const unsigned int
 
 		if (!g_eeprom.config.setting.panadapter        ||
 		    !g_panadapter_enabled                      ||
+		     g_monitor_enabled                         ||
 		     single_vfo < 0                            ||
 		     g_current_display_screen != DISPLAY_MAIN  ||
 		     g_current_function == FUNCTION_POWER_SAVE ||
-		     g_monitor_enabled                         ||
+//		     g_current_function == FUNCTION_TRANSMIT   ||
 		     g_dtmf_call_state != DTMF_CALL_STATE_NONE ||
-		     g_dtmf_is_tx                              ||
+//		     g_dtmf_is_tx                              ||
 		     g_dtmf_input_mode)
 		{	// don't draw the panadapter
 			return;