diff --git a/app/aircopy.c b/app/aircopy.c
index e1c3fa3..b02032d 100644
--- a/app/aircopy.c
+++ b/app/aircopy.c
@@ -160,7 +160,7 @@ void AIRCOPY_start_fsk_tx(const int request_block_num)
 	//          0 = enable
 	//          1 = disable
 	//
-	BK4819_WriteRegister(0x2B, (1u << 2) | (1u << 0));  // try to improve the TX waveform
+//	BK4819_WriteRegister(0x2B, (1u << 2) | (1u << 0));  // try to improve the TX waveform
 
 	// REG_59
 	//
diff --git a/driver/bk4819.c b/driver/bk4819.c
index 43c099c..b978e44 100644
--- a/driver/bk4819.c
+++ b/driver/bk4819.c
@@ -586,34 +586,6 @@ void BK4819_set_TX_deviation(unsigned int level)
 
 void BK4819_SetFilterBandwidth(const BK4819_filter_bandwidth_t Bandwidth, const bool weak_no_different)
 {
-	// REG_2B   0
-	//
-	// <10>     0 AF RX HPF 300Hz filter
-	//          0 = enable
-	//          1 = disable
-	//
-	// <9>      0 AF RX LPF 3kHz filter
-	//          0 = enable
-	//          1 = disable
-	//
-	// <8>      0 AF RX de-emphasis filter
-	//          0 = enable
-	//          1 = disable
-	//
-	// <2>      0 AF TX HPF 300Hz filter
-	//          0 = enable
-	//          1 = disable
-	//
-	// <1>      0 AF TX LPF filter
-	//          0 = enable
-	//          1 = disable
-	//
-	// <0>      0 AF TX pre-emphasis filter
-	//          0 = enable
-	//          1 = disable
-	//
-//	BK4819_WriteRegister(0x2B, 0);
-	
 	// REG_43
 	// <15>    0 ???
 	//
@@ -1839,8 +1811,8 @@ uint8_t BK4819_GetCTCType(void)
 			( 0u << 15) |
 			( 0u <<  8) |
 			( 1u <<  7) |
-			(96u <<  0));
-//			(127u <<  0));  // best waveform
+//			(96u <<  0));
+			(127u <<  0));  // best waveform
 
 		// REG_72
 		//
diff --git a/firmware.bin b/firmware.bin
index 7518b79..eef29c1 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index b2beab3..4aef4ec 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/ui/aircopy.c b/ui/aircopy.c
index b9242cc..0b66898 100644
--- a/ui/aircopy.c
+++ b/ui/aircopy.c
@@ -57,9 +57,27 @@ void UI_DisplayAircopy(void)
 
 	if (g_input_box_index == 0)
 	{	// show frequency
+
+		const unsigned int x = 16;
+		
 		NUMBER_ToDigits(g_rx_vfo->freq_config_rx.frequency, str);
-		UI_DisplayFrequency(str, 16, 2, 0, 0);
-		UI_Displaysmall_digits(2, str + 6, 97, 3, true);
+		UI_DisplayFrequency(str, x, 2, 0, 0);
+		
+		// show the remaining 2 small frequency digits
+		#ifdef ENABLE_TRIM_TRAILING_ZEROS
+		{
+			unsigned int small_num = 2;
+			if (str[7] == 0)
+			{
+				small_num--;
+				if (str[6] == 0)
+					small_num--;
+			}
+			UI_Displaysmall_digits(small_num, str + 6, x + 81, 3, true);
+		}
+		#else
+			UI_Displaysmall_digits(2, str + 6, x + 81, 3, true);
+		#endif
 	}
 	else
 	{	// user is entering a new frequency