diff --git a/MainTab.qml b/MainTab.qml
index 85714cd..bf7cca2 100644
--- a/MainTab.qml
+++ b/MainTab.qml
@@ -285,7 +285,7 @@ Item {
             if(settingsTab.mmdvmBox.checked){
                 droidstar.set_dst(_comboHost.currentText);
             }
-            else if(!droidstar.get_modelchange()){
+            if(!droidstar.get_modelchange()){
 				droidstar.process_host_change(_comboHost.currentText);
 			}
 		}
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index b6afc06..cba293e 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="73" android:installLocation="auto">
+<manifest package="org.dudetronics.droidstar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="74" android:installLocation="auto">
 
 
 	<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/dmr.cpp b/dmr.cpp
index 636e635..68e7ccd 100755
--- a/dmr.cpp
+++ b/dmr.cpp
@@ -24,7 +24,7 @@
 #include "CRCenc.h"
 #include "MMDVMDefines.h"
 
-#define DEBUG
+//#define DEBUG
 
 const uint32_t ENCODING_TABLE_1676[] =
 	{0x0000U, 0x0273U, 0x04E5U, 0x0696U, 0x09C9U, 0x0BBAU, 0x0D2CU, 0x0F5FU, 0x11E2U, 0x1391U, 0x1507U, 0x1774U,
diff --git a/p25.cpp b/p25.cpp
index 967b514..6219120 100755
--- a/p25.cpp
+++ b/p25.cpp
@@ -19,7 +19,7 @@
 #include <cstring>
 #include "p25.h"
 
-#define DEBUG
+//#define DEBUG
 
 const uint8_t REC62[] = {0x62U, 0x02U, 0x02U, 0x0CU, 0x0BU, 0x12U, 0x64U, 0x00U, 0x00U, 0x80U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U,0x00U, 0x00U, 0x00U, 0x00U, 0x00U};
 const uint8_t REC63[] = {0x63U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x02U};
diff --git a/ysf.cpp b/ysf.cpp
index 0939518..735e4aa 100755
--- a/ysf.cpp
+++ b/ysf.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 #include <cstring>
 
-#define DEBUG
+//#define DEBUG
 
 const uint32_t IMBE_INTERLEAVE[] = {
 	0,  7, 12, 19, 24, 31, 36, 43, 48, 55, 60, 67, 72, 79, 84, 91,  96, 103, 108, 115, 120, 127, 132, 139,