diff --git a/app/app.c b/app/app.c
index 0269301..b6f95d2 100644
--- a/app/app.c
+++ b/app/app.c
@@ -71,7 +71,7 @@ static void updateRSSI(const int vfo)
 
 	#ifdef ENABLE_AM_FIX
 		// add RF gain adjust compensation
-		if (gEeprom.VfoInfo[vfo].IsAM && gSetting_AM_fix)
+		if (gEeprom.VfoInfo[vfo].AM_mode && gSetting_AM_fix)
 			rssi -= rssi_gain_diff[vfo];
 	#endif
 	
@@ -433,7 +433,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	#endif
 
 	#ifdef ENABLE_AM_FIX
-		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM && reset_am_fix)
+		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && reset_am_fix)
 			AM_fix_reset(gEeprom.RX_CHANNEL);      // TODO: only reset it when moving channel/frequency
 	#endif
 
@@ -505,7 +505,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	uint8_t mixer     = orig_mixer;
 	uint8_t pga       = orig_pga;
 
-	if (gRxVfo->IsAM)
+	if (gRxVfo->AM_mode)
 	{	// AM
 /*
 		#ifndef ENABLE_AM_FIX
@@ -553,7 +553,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	#ifdef ENABLE_VOICE
 		if (gVoiceWriteIndex == 0)
 	#endif
-			BK4819_SetAF(gRxVfo->IsAM ? BK4819_AF_AM : BK4819_AF_OPEN);
+			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_OPEN);
 
 	FUNCTION_Select(Function);
 
@@ -1351,7 +1351,7 @@ void APP_TimeSlice10ms(void)
 	#endif
 
 	#ifdef ENABLE_AM_FIX
-		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM && gSetting_AM_fix)
+		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
 			AM_fix_10ms(gEeprom.RX_CHANNEL);
 	#endif
 
diff --git a/app/menu.c b/app/menu.c
index 3e10e41..0892870 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -625,8 +625,8 @@ void MENU_AcceptSetting(void)
 			break;
 
 		case MENU_AM:
-			gTxVfo->AM_CHANNEL_MODE = gSubMenuSelection;
-			gRequestSaveChannel     = 1;
+			gTxVfo->AM_mode     = gSubMenuSelection;
+			gRequestSaveChannel = 1;
 			return;
 
 		#ifdef ENABLE_AM_FIX
@@ -1013,7 +1013,7 @@ void MENU_ShowCurrentSetting(void)
 			break;
 
 		case MENU_AM:
-			gSubMenuSelection = gTxVfo->AM_CHANNEL_MODE;
+			gSubMenuSelection = gTxVfo->AM_mode;
 			break;
 
 		#ifdef ENABLE_AM_FIX
@@ -1459,9 +1459,9 @@ static void MENU_Key_STAR(const bool bKeyPressed, const bool bKeyHeld)
 	RADIO_SelectVfos();
 
 	#ifdef ENABLE_NOAA
-		if (IS_NOT_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE) && !gRxVfo->IsAM)
+		if (IS_NOT_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE) && gRxVfo->AM_mode == 0)
 	#else
-		if (!gRxVfo->IsAM)
+		if (gRxVfo->AM_mode == 0)
 	#endif
 	{
 		if (gMenuCursor == MENU_R_CTCS || gMenuCursor == MENU_R_DCS)
diff --git a/audio.c b/audio.c
index 79006a4..14de43d 100644
--- a/audio.c
+++ b/audio.c
@@ -267,7 +267,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	
 				if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
 				{
-					if (gRxVfo->IsAM)
+					if (gRxVfo->AM_mode)
 						BK4819_SetAF(BK4819_AF_AM);
 					else
 						BK4819_SetAF(BK4819_AF_OPEN);
@@ -403,12 +403,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 		}
 	
 		if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
-		{
-			if (gRxVfo->IsAM)
-				BK4819_SetAF(BK4819_AF_AM);
-			else
-				BK4819_SetAF(BK4819_AF_OPEN);
-		}
+			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_OPEN);
 	
 		#ifdef ENABLE_FMRADIO
 			if (gFmRadioMode)
diff --git a/firmware.bin b/firmware.bin
index 1106721..1370533 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 9be5749..6aeb2fc 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/functions.c b/functions.c
index b77ed96..a9df9f7 100644
--- a/functions.c
+++ b/functions.c
@@ -46,7 +46,7 @@ void FUNCTION_Init(void)
 	{
 		gCurrentCodeType = gSelectedCodeType;
 		if (gCssScanMode == CSS_SCAN_MODE_OFF)
-			gCurrentCodeType = gRxVfo->IsAM ? CODE_TYPE_OFF : gRxVfo->pRX->CodeType;
+			gCurrentCodeType = gRxVfo->AM_mode ? CODE_TYPE_OFF : gRxVfo->pRX->CodeType;
 	}
 	#ifdef ENABLE_NOAA
 		else
diff --git a/radio.c b/radio.c
index c8ec9f8..8d90251 100644
--- a/radio.c
+++ b/radio.c
@@ -33,6 +33,7 @@
 #include "misc.h"
 #include "radio.h"
 #include "settings.h"
+#include "ui/menu.h"
 
 VFO_Info_t    *gTxVfo;
 VFO_Info_t    *gRxVfo;
@@ -135,10 +136,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t Band, uint32
 	#endif
 
 	if (ChannelSave == (FREQ_CHANNEL_FIRST + BAND2_108MHz))
-	{
-		pInfo->AM_CHANNEL_MODE = true;
-		pInfo->IsAM            = true;
-	}
+		pInfo->AM_mode = 1;
 
 	RADIO_ConfigureSquelchAndOutputPower(pInfo);
 }
@@ -220,8 +218,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 	Band = Attributes & MR_CH_BAND_MASK;
 	if (Band > BAND7_470MHz)
 	{
-//		Band = BAND6_400MHz;
-		Band = FREQUENCY_GetBand(gEeprom.ScreenChannel[VFO]);   // 111 bug fix, or have I broke it ?
+		Band = BAND6_400MHz;
+//		Band = FREQUENCY_GetBand(gEeprom.ScreenChannel[VFO]);   // 1of11 bug fix, or have I broke it ?
 	}
 
 	if (IS_MR_CHANNEL(Channel))
@@ -251,13 +249,15 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		uint8_t Tmp;
 		uint8_t Data[8];
 
+		// ***************
+
 		EEPROM_ReadBuffer(Base + 8, Data, sizeof(Data));
 
 		Tmp = Data[3] & 0x0F;
-		if (Tmp > 2)
+		if (Tmp > TX_OFFSET_FREQUENCY_DIRECTION_SUB)
 			Tmp = 0;
 		gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY_DIRECTION = Tmp;
-		gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE               = !!(Data[3] & 0x10);
+		gEeprom.VfoInfo[VFO].AM_mode = (Data[3] >> 4) & 1u;
 
 		Tmp = Data[6];
 		if (Tmp >= ARRAY_SIZE(StepFrequencyTable))
@@ -266,7 +266,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		gEeprom.VfoInfo[VFO].StepFrequency = StepFrequencyTable[Tmp];
 
 		Tmp = Data[7];
-		if (Tmp > 10)
+		if (Tmp > (ARRAY_SIZE(gSubMenu_SCRAMBLER) - 1))
 			Tmp = 0;
 		gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE = Tmp;
 
@@ -283,13 +283,13 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 				break;
 
 			case CODE_TYPE_CONTINUOUS_TONE:
-				if (Tmp >= 50)
+				if (Tmp > (ARRAY_SIZE(CTCSS_Options) - 1))
 					Tmp = 0;
 				break;
 
 			case CODE_TYPE_DIGITAL:
 			case CODE_TYPE_REVERSE_DIGITAL:
-				if (Tmp >= 104)
+				if (Tmp > (ARRAY_SIZE(DCS_Options) - 1))
 					Tmp = 0;
 				break;
 		}
@@ -305,13 +305,13 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 				break;
 
 			case CODE_TYPE_CONTINUOUS_TONE:
-				if (Tmp >= 50)
+				if (Tmp > (ARRAY_SIZE(CTCSS_Options) - 1))
 					Tmp = 0;
 				break;
 
 			case CODE_TYPE_DIGITAL:
 			case CODE_TYPE_REVERSE_DIGITAL:
-				if (Tmp >= 104)
+				if (Tmp > (ARRAY_SIZE(DCS_Options) - 1))
 					Tmp = 0;
 				break;
 		}
@@ -344,6 +344,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 			gEeprom.VfoInfo[VFO].DTMF_PTT_ID_TX_MODE  =   ((Data[5] >> 1) & 3u);
 		}
 
+		// ***************
+		
 		struct
 		{
 			uint32_t Frequency;
@@ -357,6 +359,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		if (Info.Offset >= 100000000)
 			Info.Offset = 1000000;
 		gEeprom.VfoInfo[VFO].TX_OFFSET_FREQUENCY = Info.Offset;
+
+		// ***************
 	}
 
 	Frequency = pRadio->freq_config_RX.Frequency;
@@ -410,16 +414,13 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 			pConfig->Frequency = 43300000;
 	}
 
-	if (gEeprom.VfoInfo[VFO].AM_CHANNEL_MODE)
-	{
-		gEeprom.VfoInfo[VFO].IsAM                 = true;
-		gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE      = 0;
-		gEeprom.VfoInfo[VFO].DTMF_DECODING_ENABLE = false;
-		gEeprom.VfoInfo[VFO].freq_config_RX.CodeType    = CODE_TYPE_OFF;
-		gEeprom.VfoInfo[VFO].freq_config_TX.CodeType    = CODE_TYPE_OFF;
+	if (gEeprom.VfoInfo[VFO].AM_mode)
+	{	// freq/chan is in AM mode
+		gEeprom.VfoInfo[VFO].SCRAMBLING_TYPE         = 0;
+		gEeprom.VfoInfo[VFO].DTMF_DECODING_ENABLE    = false;  // no reason to disable DTMF decoding, aircraft use DTMF on SSB
+		gEeprom.VfoInfo[VFO].freq_config_RX.CodeType = CODE_TYPE_OFF;
+		gEeprom.VfoInfo[VFO].freq_config_TX.CodeType = CODE_TYPE_OFF;
 	}
-	else
-		gEeprom.VfoInfo[VFO].IsAM = false;
 
 	#ifdef ENABLE_COMPANDER
 		gEeprom.VfoInfo[VFO].Compander = (Attributes & MR_CH_COMPAND) >> 4;
@@ -591,7 +592,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 		case BK4819_FILTER_BW_WIDE:
 		case BK4819_FILTER_BW_NARROW:
 			#ifdef ENABLE_AM_FIX
-//				BK4819_SetFilterBandwidth(Bandwidth, gRxVfo->IsAM && gSetting_AM_fix);
+//				BK4819_SetFilterBandwidth(Bandwidth, gRxVfo->AM_mode && gSetting_AM_fix);
 				BK4819_SetFilterBandwidth(Bandwidth, false);
 			#else
 				BK4819_SetFilterBandwidth(Bandwidth, false);
@@ -647,7 +648,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 		if (IS_NOT_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE))
 	#endif
 	{
-		if (!gRxVfo->IsAM)
+		if (gRxVfo->AM_mode == 0)
 		{
 			uint8_t CodeType = gSelectedCodeType;
 			uint8_t Code     = gSelectedCode;
@@ -722,15 +723,15 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	#ifdef ENABLE_NOAA
 		#ifdef ENABLE_FMRADIO
-			if (gEeprom.VOX_SWITCH && !gFmRadioMode && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && !gFmRadioMode && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
 		#else
-			if (gEeprom.VOX_SWITCH && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
 		#endif
 	#else
 		#ifdef ENABLE_FMRADIO
-			if (gEeprom.VOX_SWITCH && !gFmRadioMode && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && !gFmRadioMode && gCurrentVfo->AM_mode == 0)
 		#else
-			if (gEeprom.VOX_SWITCH && !gCurrentVfo->IsAM)
+			if (gEeprom.VOX_SWITCH && gCurrentVfo->AM_mode == 0)
 		#endif
 	#endif
 	{
@@ -742,13 +743,13 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	#ifdef ENABLE_COMPANDER
 		// RX expander
-		BK4819_SetCompander((!gRxVfo->IsAM && gRxVfo->Compander >= 2) ? gRxVfo->Compander : 0);
+		BK4819_SetCompander((gRxVfo->AM_mode == 0 && gRxVfo->Compander >= 2) ? gRxVfo->Compander : 0);
 	#endif
 
 	#if 0
 		// there's no reason the DTMF decoder can't be used in AM RX mode too
 		// aircraft comms use it on HF (AM and SSB)
-		if (gRxVfo->IsAM || (!gRxVfo->DTMF_DECODING_ENABLE && !gSetting_KILLED))
+		if (gRxVfo->AM_mode || (!gRxVfo->DTMF_DECODING_ENABLE && !gSetting_KILLED))
 		{
 			BK4819_DisableDTMF();
 		}
@@ -841,7 +842,7 @@ void RADIO_SetTxParameters(void)
 		case BK4819_FILTER_BW_WIDE:
 		case BK4819_FILTER_BW_NARROW:
 			#ifdef ENABLE_AM_FIX
-//				BK4819_SetFilterBandwidth(Bandwidth, gCurrentVfo->IsAM && gSetting_AM_fix);
+//				BK4819_SetFilterBandwidth(Bandwidth, gCurrentVfo->AM_mode && gSetting_AM_fix);
 				BK4819_SetFilterBandwidth(Bandwidth, false);
 			#else
 				BK4819_SetFilterBandwidth(Bandwidth, false);
@@ -853,7 +854,7 @@ void RADIO_SetTxParameters(void)
 
 	#ifdef ENABLE_COMPANDER
 		// TX compressor
-		BK4819_SetCompander((!gRxVfo->IsAM && (gRxVfo->Compander == 1 || gRxVfo->Compander >= 3)) ? gRxVfo->Compander : 0);
+		BK4819_SetCompander((gRxVfo->AM_mode == 0 && (gRxVfo->Compander == 1 || gRxVfo->Compander >= 3)) ? gRxVfo->Compander : 0);
 	#endif
 
 	BK4819_PrepareTransmit();
@@ -953,7 +954,7 @@ void RADIO_PrepareTX(void)
 	#endif
 	{
 		#ifndef ENABLE_TX_WHEN_AM
-			if (gCurrentVfo->IsAM)
+			if (gCurrentVfo->AM_mode)
 			{	// not allowed to TX if in AM mode
 				State = VFO_STATE_TX_DISABLE;
 			}
diff --git a/radio.h b/radio.h
index 70b39a6..1b85136 100644
--- a/radio.h
+++ b/radio.h
@@ -136,8 +136,7 @@ typedef struct VFO_Info_t
 
 	uint8_t        BUSY_CHANNEL_LOCK;
 
-	uint8_t        AM_CHANNEL_MODE;
-	bool           IsAM;
+	uint8_t        AM_mode;
 
 	#ifdef ENABLE_COMPANDER
 		uint8_t    Compander;
diff --git a/settings.c b/settings.c
index 56cd405..e0203a7 100644
--- a/settings.c
+++ b/settings.c
@@ -208,7 +208,7 @@ void SETTINGS_SaveChannel(uint8_t Channel, uint8_t VFO, const VFO_Info_t *pVFO,
 			State[0] =  pVFO->freq_config_RX.Code;
 			State[1] =  pVFO->freq_config_TX.Code;
 			State[2] = (pVFO->freq_config_TX.CodeType << 4) | pVFO->freq_config_RX.CodeType;
-			State[3] = (pVFO->AM_CHANNEL_MODE         << 4) | pVFO->TX_OFFSET_FREQUENCY_DIRECTION;
+			State[3] = ((pVFO->AM_mode & 1u)          << 4) | pVFO->TX_OFFSET_FREQUENCY_DIRECTION;
 			State[4] = 0
 				| (pVFO->BUSY_CHANNEL_LOCK << 4)
 				| (pVFO->OUTPUT_POWER      << 2)
diff --git a/ui/main.c b/ui/main.c
index b8ddb13..5259389 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -467,7 +467,7 @@ void UI_DisplayMain(void)
 		// ************
 
 		String[0] = '\0';
-		if (gEeprom.VfoInfo[vfo_num].IsAM)
+		if (gEeprom.VfoInfo[vfo_num].AM_mode)
 		{	// show the AM symbol
 			strcpy(String, "AM");
 		}
@@ -526,7 +526,7 @@ void UI_DisplayMain(void)
 	{	// we're free to use the middle empty line for something
 
 		#if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA)
-			if (gSetting_AM_fix && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM)
+			if (gSetting_AM_fix && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode)
 			{
 				switch (gCurrentFunction)
 				{