diff --git a/Makefile b/Makefile
index a4e046b..d2f2522 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,9 @@ ENABLE_SWD                    := 0
 ENABLE_OVERLAY                := 1
 ENABLE_UART                   := 1
 ENABLE_AIRCOPY                := 0
-ENABLE_FMRADIO                := 0
+ENABLE_FMRADIO                := 1
 ENABLE_NOAA                   := 0
-ENABLE_VOICE                  := 0
+ENABLE_VOICE                  := 1
 ENABLE_ALARM                  := 0
 ENABLE_BIG_FREQ               := 0
 ENABLE_SMALL_BOLD             := 1
@@ -20,14 +20,14 @@ ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
 ENABLE_MAIN_KEY_HOLD          := 1
 ENABLE_BOOT_BEEPS             := 0
 ENABLE_COMPANDER              := 1
-ENABLE_SHOW_CHARGE_LEVEL      := 1
+ENABLE_SHOW_CHARGE_LEVEL      := 0
 ENABLE_REVERSE_BAT_SYMBOL     := 1
 ENABLE_NO_SCAN_TIMEOUT        := 1
 ENABLE_AM_FIX                 := 1
 ENABLE_AM_FIX_SHOW_DATA       := 1
 ENABLE_SQUELCH1_LOWER         := 0
 ENABLE_AUDIO_BAR              := 0
-ENABLE_COPY_CHAN_TO_VFO       := 1
+#ENABLE_COPY_CHAN_TO_VFO      := 1
 #ENABLE_SINGLE_VFO_CHAN       := 1
 #ENABLE_BAND_SCOPE            := 1
 
@@ -142,7 +142,7 @@ SIZE = arm-none-eabi-size
 GIT_HASH := $(shell git rev-parse --short HEAD)
 #GIT_HASH := 230925b
 
-$(info GIT_HASH = $(GIT_HASH)) 
+$(info GIT_HASH = $(GIT_HASH))
 
 ASFLAGS = -c -mcpu=cortex-m0
 ifeq ($(ENABLE_OVERLAY),1)
diff --git a/app/main.c b/app/main.c
index 2aa73a1..4e03cd5 100644
--- a/app/main.c
+++ b/app/main.c
@@ -25,6 +25,7 @@
 #include "app/main.h"
 #include "app/scanner.h"
 #include "audio.h"
+#include "driver/bk4819.h"
 #include "dtmf.h"
 #include "frequencies.h"
 #include "misc.h"
@@ -33,13 +34,6 @@
 #include "ui/inputbox.h"
 #include "ui/ui.h"
 
-// TEST ONLY
-#include "driver/bk4819.h"
-
-//#ifndef ARRAY_SIZE
-//	#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-//#endif
-
 static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 {
 	uint8_t Band;
diff --git a/app/menu.c b/app/menu.c
index e005feb..44730ec 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -320,7 +320,7 @@ void MENU_AcceptSetting(void)
 			if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
 			{
 				gTxVfo->STEP_SETTING = gSubMenuSelection;
-				gRequestSaveChannel  = 2;
+				gRequestSaveChannel  = 1;
 				return;
 			}
 			gSubMenuSelection = gTxVfo->STEP_SETTING;
@@ -328,7 +328,7 @@ void MENU_AcceptSetting(void)
 
 		case MENU_TXP:
 			gTxVfo->OUTPUT_POWER = gSubMenuSelection;
-			gRequestSaveChannel = 2;
+			gRequestSaveChannel = 1;
 			return;
 
 		case MENU_T_DCS:
@@ -400,17 +400,17 @@ void MENU_AcceptSetting(void)
 
 		case MENU_W_N:
 			gTxVfo->CHANNEL_BANDWIDTH = gSubMenuSelection;
-			gRequestSaveChannel       = 2;
+			gRequestSaveChannel       = 1;
 			return;
 
 		case MENU_SCR:
 			gTxVfo->SCRAMBLING_TYPE = gSubMenuSelection;
-			gRequestSaveChannel     = 2;
+			gRequestSaveChannel     = 1;
 			return;
 
 		case MENU_BCL:
 			gTxVfo->BUSY_CHANNEL_LOCK = gSubMenuSelection;
-			gRequestSaveChannel       = 2;
+			gRequestSaveChannel       = 1;
 			return;
 
 		case MENU_MEM_CH:
@@ -541,7 +541,7 @@ void MENU_AcceptSetting(void)
 		#ifdef ENABLE_COMPANDER
 			case MENU_COMPAND:
 				gTxVfo->Compander = gSubMenuSelection;
-				gRequestSaveChannel = 2;
+				gRequestSaveChannel = 1;
 				return;
 		#endif
 
@@ -621,7 +621,7 @@ void MENU_AcceptSetting(void)
 
 		case MENU_AM:
 			gTxVfo->AM_CHANNEL_MODE = gSubMenuSelection;
-			gRequestSaveChannel     = 2;
+			gRequestSaveChannel     = 1;
 			return;
 
 		#ifdef ENABLE_AM_FIX
diff --git a/firmware.bin b/firmware.bin
index f824da8..042205b 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 4e37676..3e53dec 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ