diff --git a/am_fix.c b/am_fix.c
index d1ebb19..3fb7e65 100644
--- a/am_fix.c
+++ b/am_fix.c
@@ -329,7 +329,7 @@ const uint8_t orig_pga       = 6;   //  -3dB
 	void AM_fix_init(void)
 	{	// called at boot-up
 	
-/*		unsigned int i;
+		unsigned int i;
 		for (i = 0; i < 2; i++)
 		{
 			#ifdef ENABLE_AM_FIX_TEST1
@@ -338,7 +338,7 @@ const uint8_t orig_pga       = 6;   //  -3dB
 				am_fix_gain_table_index[i] = original_index;  // re-start with original QS setting
 			#endif
 		}
-*/
+
 		orig_dB_gain = lna_short_dB[orig_lna_short] + lna_dB[orig_lna] + mixer_dB[orig_mixer] + pga_dB[orig_pga];
 
 		#if 0
@@ -374,9 +374,9 @@ const uint8_t orig_pga       = 6;   //  -3dB
 		rssi_db_gain_diff[vfo] = 0;
 
 		#ifdef ENABLE_AM_FIX_TEST1
-			am_fix_gain_table_index[vfo] = 1 + gSetting_AM_fix_test1;
+//			am_fix_gain_table_index[vfo] = 1 + gSetting_AM_fix_test1;
 		#else
-			am_fix_gain_table_index[vfo] = original_index;  // re-start with original QS setting
+//			am_fix_gain_table_index[vfo] = original_index;  // re-start with original QS setting
 		#endif
 
 		am_fix_gain_table_index_prev[vfo] = 0;
diff --git a/app/app.c b/app/app.c
index 64be95d..ba54990 100644
--- a/app/app.c
+++ b/app/app.c
@@ -861,6 +861,9 @@ void APP_EndTransmission(void)
 	}
 
 	RADIO_SetupRegisters(false);
+
+	if (gMonitor)
+		ACTION_Monitor();   // 1of11
 }
 
 static void APP_HandleVox(void)
@@ -2103,7 +2106,6 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	}
 
 	if (gF_LOCK && (Key == KEY_PTT || Key == KEY_SIDE2 || Key == KEY_SIDE1))
-//	if (gF_LOCK && Key == KEY_PTT)
 		return;
 
 	if (!bFlag)
diff --git a/app/generic.c b/app/generic.c
index d474516..165c899 100644
--- a/app/generic.c
+++ b/app/generic.c
@@ -119,7 +119,9 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 					APP_EndTransmission();
 
 					if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
+					{
 						FUNCTION_Select(FUNCTION_FOREGROUND);
+					}
 					else
 						gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
 				}
diff --git a/firmware.bin b/firmware.bin
index 721ffd3..d75f7d8 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 290c67f..56d3bc0 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/functions.c b/functions.c
index 7b84c64..c5a94cb 100644
--- a/functions.c
+++ b/functions.c
@@ -130,7 +130,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 			
 		case FUNCTION_INCOMING:
 		case FUNCTION_RECEIVE:
-			gMonitor = false;
+//			gMonitor = false;
 			break;
 	
 		case FUNCTION_POWER_SAVE: