diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 243c03e63..b5f3b386d 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1539,7 +1539,7 @@ void WIFICallback() {
     // This is done after we have a WiFi signal to avoid any resource conflicts
 
     if (myESP.getUseSerial()) {
-        myDebug_P(PSTR("Warning! EMS bus disabled when in Serial mode. Use 'set serial off' to start EMS."));
+        myDebug_P(PSTR("Warning! EMS bus communication disabled when Serial mode enabled. Use 'set serial off' to start communication."));
     } else {
         emsuart_init();
         myDebug_P(PSTR("[UART] Opened Rx/Tx connection"));
diff --git a/src/ems.cpp b/src/ems.cpp
index 2e5f55e07..aedbe4651 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -331,7 +331,6 @@ bool ems_getPoll() {
 
 void ems_setTxDelay(uint8_t delay) {
     EMS_Sys_Status.emsTxDelay = delay;
-    myDebug_P(PSTR("EMS Tx delay is %d"), EMS_Sys_Status.emsTxDelay);
 }
 
 uint8_t ems_getTxDelay() {
diff --git a/src/emsuart.cpp b/src/emsuart.cpp
index f21cb5e55..4dde6fe0f 100644
--- a/src/emsuart.cpp
+++ b/src/emsuart.cpp
@@ -119,7 +119,7 @@ void ICACHE_FLASH_ATTR emsuart_init() {
     USC1(EMSUART_UART) = (EMS_MAX_TELEGRAM_LENGTH << UCFFT) | (0x02 << UCTOT) | (1 << UCTOE); // enable interupts
 
     // set interrupts for triggers
-    USIC(EMSUART_UART) = 0xffff; // clear all interupts
+    USIC(EMSUART_UART) = 0xFFFF; // clear all interupts
     USIE(EMSUART_UART) = 0;      // disable all interrupts
 
     // enable rx break, fifo full and timeout.
@@ -143,15 +143,10 @@ void ICACHE_FLASH_ATTR emsuart_init() {
 
 /*
  * stop UART0 driver
+ * This is called prior to an OTA upload and also before a save to SPIFFS to prevent conflicts
  */
 void ICACHE_FLASH_ATTR emsuart_stop() {
     ETS_UART_INTR_DISABLE();
-    ETS_UART_INTR_ATTACH(NULL, NULL);
-    noInterrupts();
-#ifndef NO_UART_SWAP
-    //detachInterrupt(digitalPinToInterrupt(D7));
-    system_uart_swap(); // to be sure, swap Tx/Rx back.
-#endif
 }
 
 /*
@@ -169,7 +164,7 @@ void ICACHE_FLASH_ATTR emsuart_tx_brk() {
     uint32_t tmp;
 
     // must make sure Tx FIFO is empty
-    while (((USS(EMSUART_UART) >> USTXC) & 0xff) != 0)
+    while (((USS(EMSUART_UART) >> USTXC) & 0xFF) != 0)
         ;
 
     tmp = ((1 << UCRXRST) | (1 << UCTXRST)); // bit mask
@@ -198,7 +193,6 @@ static inline void ICACHE_FLASH_ATTR emsuart_loopback(bool enable) {
  * Send to Tx, ending with a <BRK>
  */
 void ICACHE_FLASH_ATTR emsuart_tx_buffer(uint8_t * buf, uint8_t len) {
-    uint32_t tmp;
 
     // backwards compatibility
     if (EMS_Sys_Status.emsTxDelay < 2) {
@@ -222,8 +216,6 @@ void ICACHE_FLASH_ATTR emsuart_tx_buffer(uint8_t * buf, uint8_t len) {
         * At end of receive we re-enable Rx-INT and send a Tx-BRK in loopback mode.
         */
 
-        /* COMMENTED OUT - NOT WORKING
-
         ETS_UART_INTR_DISABLE(); // disable rx interrupt
         emsuart_flush_fifos();
 
@@ -253,10 +245,8 @@ void ICACHE_FLASH_ATTR emsuart_tx_buffer(uint8_t * buf, uint8_t len) {
             emsuart_loopback(false); // disable loopback mode
         }
 
-
         ETS_UART_INTR_ENABLE(); // receive anything from FIFO...
 
-        */
     }
 }
 
diff --git a/src/version.h b/src/version.h
index c59324730..b71406fcb 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,5 +6,5 @@
 #pragma once
 
 #define APP_NAME "EMS-ESP"
-#define APP_VERSION "1.8.0b2"
+#define APP_VERSION "1.8.0b3"
 #define APP_HOSTNAME "ems-esp"