diff --git a/src/configuration.h b/src/configuration.h
index f0d44a3e..f932d301 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -142,10 +142,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 
 // Disable use of the NTP library and related features
-//#define DISABLE_NTP
+// #define DISABLE_NTP
 
 // Disable the welcome screen and allow 
-#define DISABLE_WELCOME_UNSET
+// #define DISABLE_WELCOME_UNSET
 
 // -----------------------------------------------------------------------------
 // OLED & Input
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index c5e06c85..b8eb7917 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1531,10 +1531,10 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     case Config_LoRaConfig_ModemPreset_MedFast:
         mode = "MedF";
         break;
-    case Config_LoRaConfig_ModemPreset_LongFast:
+    case Config_LoRaConfig_ModemPreset_LongSlow:
         mode = "LongS";
         break;
-    case Config_LoRaConfig_ModemPreset_LongSlow:
+    case Config_LoRaConfig_ModemPreset_LongFast:
         mode = "LongF";
         break;
     case Config_LoRaConfig_ModemPreset_VLongSlow:
diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp
index 01e7e0f4..2385da77 100644
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -211,7 +211,7 @@ const char *Channels::getName(size_t chIndex)
         // the app fucked up and forgot to set channelSettings.name
 
         if (config.lora.bandwidth != 0)
-            channelName = "Unset";
+            channelName = "Custom";
         else
             switch (config.lora.modem_preset) {
             case Config_LoRaConfig_ModemPreset_ShortSlow:
@@ -226,10 +226,10 @@ const char *Channels::getName(size_t chIndex)
             case Config_LoRaConfig_ModemPreset_MedFast:
                 channelName = "MedF";
                 break;
-            case Config_LoRaConfig_ModemPreset_LongFast:
+            case Config_LoRaConfig_ModemPreset_LongSlow:
                 channelName = "LongS";
                 break;
-            case Config_LoRaConfig_ModemPreset_LongSlow:
+            case Config_LoRaConfig_ModemPreset_LongFast:
                 channelName = "LongF";
                 break;
             case Config_LoRaConfig_ModemPreset_VLongSlow: