diff --git a/.gitignore b/.gitignore
index 887d4c52b..9f5029d80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,4 @@ scripts/stackdmp.txt
 firmware
 *.bin
 emsesp
-doc/github.txt
-doc/test_data.txt
 
-/src/uart/uart_proddy.txt
diff --git a/README.md b/README.md
index a484eaa51..79ac9a0cc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # EMS-ESP version 2.0 (alpha)
 
-*Warning: this is a snapshot from my EMS-ESP2 development repo and still in early stages of it's development. Not all features have been fully tested. Use at your own risk!*
+*Warning: this is still in early stages of it's development. Not all features have been fully tested. Use at your own risk!*
 
 Note: Version 2.0 is not backward compatible with v1.0. The File system structure is different. When coming from version 1.9.x its best if you first erase the flash on the ESP and upload using USB. `esptool.py erase_flash` will clean the flash and `esptool.py -p COM6 -b 921600 write_flash 0x00000 firmware.bin` is an example of how to upload the firmware over USB.
 
@@ -41,7 +41,7 @@ Note: Version 2.0 is not backward compatible with v1.0. The File system structur
 common commands available in all contexts:
   exit
   help
-  log [level] [raw] [trace ID]
+  log [level] [full|raw] [trace ID]
   su
 
 (top level)
@@ -125,8 +125,6 @@ thermostat
 
 ```
 TODO ESP32 - when saving SPIFFS the UART stop and restart() functions need to flush queue to avoid miss fires
-TODO network issues with ESP8266 - can take a while to get an IP address. DNS issue?
-TODO figure out why sometimes telnet on ESP32 (and sometimes ESP8266) has slow response times. After a manual reset it seems to fix itself. Perhaps the telnet service needs to start after the wifi is up & running.
 TODO sometimes with tx_mode 0 there are a few CRC errors due to collision when waiting for a BRK signal.
 TODO console auto-complete with 'set' command in the system context is not showing all commands, only the hostname.
 ```
diff --git a/platformio.ini b/platformio.ini
index b1e35ed65..d786a40d2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,5 +1,4 @@
-; PlatformIO Project Configuration File
-; For EMS-ESP
+; PlatformIO Project Configuration File for EMS-ESP
 
 [platformio]
 default_envs = esp8266
@@ -62,7 +61,7 @@ check_flags =
     clangtidy: --checks=-*,clang-analyzer-*,performance-*
 
 ; USB upload
- ;upload_protocol = esptool
+; upload_protocol = esptool
 ; example ports for OSX
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
@@ -80,6 +79,7 @@ build_type = release
 platform = espressif8266 ; https://github.com/platformio/platform-espressif8266/releases
 ;platform = espressif8266@2.4.0 ; Arduino core 2.6.3 
 board = esp12e
+board_build.flash_mode = dout
 ; board = d1_mini ; https://github.com/platformio/platform-espressif8266/blob/master/boards/d1_mini.json
 lib_deps = ${common.libs_core} ${common.libs_esp8266}
 board_build.f_cpu = 160000000L ; 160MHz
diff --git a/src/boiler.cpp b/src/boiler.cpp
index d6c5658fd..6b11f8b28 100644
--- a/src/boiler.cpp
+++ b/src/boiler.cpp
@@ -389,7 +389,7 @@ void Boiler::show_values(uuid::console::Shell & shell) {
     print_value(shell, 2, F("Boiler pump"), Helpers::render_value(buffer, heatPmp_, EMS_VALUE_BOOL));
     print_value(shell, 2, F("Fan"), Helpers::render_value(buffer, fanWork_, EMS_VALUE_BOOL));
     print_value(shell, 2, F("Ignition"), Helpers::render_value(buffer, ignWork_, EMS_VALUE_BOOL));
-    
+
     print_value(shell, 2, F("Burner selected max power"), F_(percent), Helpers::render_value(buffer, selBurnPow_, 1));
     print_value(shell, 2, F("Burner current power"), F_(percent), Helpers::render_value(buffer, curBurnPow_, 1));
     print_value(shell, 2, F("Flame current"), F("uA"), Helpers::render_value(buffer, flameCurr_, 10));
diff --git a/src/console.cpp b/src/console.cpp
index c0c61053f..df5b9b270 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -438,7 +438,7 @@ void Console::start() {
 // note, this must be started after the network/wifi for ESP32 otherwise it'll crash
 #ifndef EMSESP_STANDALONE
     telnet_.start();
-    // telnet_.default_write_timeout(1000); // in ms, socket timeout 1 second
+    telnet_.default_write_timeout(1000); // in ms, socket timeout 1 second
 #endif
 }
 
diff --git a/src/device_library.h b/src/device_library.h
index 2f1e9a492..7f40fdae5 100644
--- a/src/device_library.h
+++ b/src/device_library.h
@@ -39,7 +39,6 @@
 {208, DeviceType::BOILER, F("Logamax plus/GB192/Condens GC9000"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {234, DeviceType::BOILER, F("Logamax Plus GB122"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
-
 // Solar Modules - 0x30
 { 73, DeviceType::SOLAR, F("SM10"), DeviceFlags::EMS_DEVICE_FLAG_SM10},
 {101, DeviceType::SOLAR, F("ISM1"), DeviceFlags::EMS_DEVICE_FLAG_SM100},
@@ -58,7 +57,7 @@
 {252, DeviceType::HEATPUMP, F("HP Module"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
 // Switches - 0x11
-{ 71, DeviceType::SWITCH, F("WM10"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x11
+{ 71, DeviceType::SWITCH, F("WM10"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
 // Controllers - 0x09 / 0x10 / 0x50
 { 68, DeviceType::CONTROLLER, F("BC10/RFM20"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09
@@ -75,11 +74,10 @@
 {230, DeviceType::CONTROLLER, F("BC Base"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09
 {241, DeviceType::CONTROLLER, F("Condens 5000i"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09
 
-
 // Connect devices - 0x02
-{171, DeviceType::CONNECT, F("OpenTherm Converter"), DeviceFlags::EMS_DEVICE_FLAG_NONE},   // 0x02
-{205, DeviceType::CONNECT, F("Moduline Easy Connect"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x02
-{206, DeviceType::CONNECT, F("Easy Connect"), DeviceFlags::EMS_DEVICE_FLAG_NONE},          // 0x02
+{171, DeviceType::CONNECT, F("OpenTherm Converter"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{205, DeviceType::CONNECT, F("Moduline Easy Connect"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{206, DeviceType::CONNECT, F("Easy Connect"), DeviceFlags::EMS_DEVICE_FLAG_NONE},       
 
 // Gateways - 0x48 / 0x18
 { 94, DeviceType::GATEWAY, F("RFM20 Remote Base for RC20RF"), DeviceFlags::EMS_DEVICE_FLAG_NONE},     // 0x18
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index 22ecd8239..61791328e 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -247,7 +247,6 @@ std::string EMSESP::pretty_telegram(std::shared_ptr<const Telegram> telegram) {
             // get the type name, any match will do
             if (type_name.empty()) {
                 type_name = emsdevice->telegram_type_name(telegram);
-
             }
         }
     }
@@ -364,11 +363,7 @@ void EMSESP::process_version(std::shared_ptr<const Telegram> telegram) {
 
     // get version as XX.XX
     std::string version(5, '\0');
-    snprintf_P(&version[0],
-               version.capacity() + 1,
-               PSTR("%02d.%02d"),
-               telegram->message_data[offset + 1],
-               telegram->message_data[offset + 2]);
+    snprintf_P(&version[0], version.capacity() + 1, PSTR("%02d.%02d"), telegram->message_data[offset + 1], telegram->message_data[offset + 2]);
 
     // some devices store the protocol type (HT3, Buderus) in the last byte
     uint8_t brand;
@@ -569,7 +564,7 @@ void EMSESP::incoming_telegram(uint8_t * data, const uint8_t length) {
     uint8_t first_value = data[0];
     if (((first_value & 0x7F) == txservice_.ems_bus_id()) && (length > 1)) {
         rxservice_.add(data, length); // just for logging
-        return; // it's an echo
+        return;                       // it's an echo
     }
 
     // are we waiting for a response from a recent Tx Read or Write?
@@ -786,7 +781,7 @@ void EMSESP::console_commands(Shell & shell, unsigned int context) {
                                            Settings settings;
                                            shell.printfln(F_(tx_mode_fmt), settings.ems_tx_mode());
                                            shell.printfln(F_(bus_id_fmt), settings.ems_bus_id());
-                                           shell.printfln(F_(read_only_fmt), settings.ems_read_only() ? F_(enabled) : F_(disabled));
+                                           shell.printfln(F_(read_only_fmt), settings.ems_read_only() ? F_(on) : F_(off));
                                        });
 
     // enter the context
@@ -801,8 +796,8 @@ void EMSESP::start() {
     };
 
     system_.start();
-    network_.start();
     console_.start();
+    network_.start();
     sensors_.start();
     rxservice_.start();
     txservice_.start();
@@ -817,20 +812,24 @@ void EMSESP::loop() {
     // network returns false if an OTA is being carried out
     // so we disable all services when an OTA is happening
     if (network_.loop()) {
-        console_.loop();   // telnet/serial console
         system_.loop();    // does LED and checks system health, and syslog service
         mqtt_.loop();      // starts mqtt, and sends out anything in the queue
         rxservice_.loop(); // process what ever is in the rx queue
         txservice_.loop(); // check that the Tx is all ok
         shower_.loop();    // check for shower on/off
         sensors_.loop();   // this will also send out via MQTT
-        delay(MYESP_DELAY); // some time to WiFi and everything else to catch up, calls yield, and also prevent overheating
+        console_.loop();   // telnet/serial console
+        delay(ESP_DELAY);  // some time to WiFi and everything else to catch up, calls yield, and also prevent overheating
 
         // force a query on the EMS devices to fetch latest data at a set interval (1 min)
         if ((uuid::get_uptime() - last_fetch_ > EMS_FETCH_FREQUENCY)) {
             last_fetch_ = uuid::get_uptime();
             fetch_device_values();
         }
+
+        // helps ease wifi outages
+        // https://github.com/esp8266/Arduino/blob/e721089e601985e633641ab7323f81a84ea0cd1b/cores/esp8266/core_esp8266_wiring.cpp#L41-L57
+        delay(1);
     }
 }
 
diff --git a/src/emsesp.h b/src/emsesp.h
index 977dbfafa..b93a5803a 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -46,7 +46,7 @@
 #include "shower.h"
 
 #define LOG_TRACE_WATCH_NONE 0 // no watch set
-#define MYESP_DELAY 1
+#define ESP_DELAY 1
 
 namespace emsesp {
 
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 2350f53e1..c0c176559 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -279,7 +279,7 @@ uint32_t Helpers::hextoint(const char * hex) {
             byte = byte - 'a' + 10;
         else if (byte >= 'A' && byte <= 'F')
             byte = byte - 'A' + 10;
-        else 
+        else
             return 0; // error
         // shift 4 to make space for new digit, and add the 4 bits of the new digit
         val = (val << 4) | (byte & 0xF);
diff --git a/src/mixing.h b/src/mixing.h
index 6b430f62e..d81443b7f 100644
--- a/src/mixing.h
+++ b/src/mixing.h
@@ -63,7 +63,6 @@ class Mixing : public EMSdevice {
     uint8_t  status_      = EMS_VALUE_UINT_NOTSET;
     uint8_t  flowSetTemp_ = EMS_VALUE_UINT_NOTSET;
     Type     type_        = Type::NONE;
-
 };
 
 } // namespace emsesp
diff --git a/src/network.cpp b/src/network.cpp
index 39394d473..036070384 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -44,6 +44,12 @@ void Network::start() {
     sta_mode_disconnected_ = WiFi.onStationModeDisconnected(std::bind(&Network::sta_mode_disconnected, this, _1));
     sta_mode_got_ip_       = WiFi.onStationModeGotIP(std::bind(&Network::sta_mode_got_ip, this, _1));
 
+    WiFi.setSleepMode(WIFI_NONE_SLEEP); // added to possibly fix wifi dropouts in arduino core 2.5.0
+    // ref: https://github.com/esp8266/Arduino/issues/6471
+    // ref: https://github.com/esp8266/Arduino/issues/6366
+    // high tx power causing weird behavior, slightly lowering from 20.5 to 20.0 may help stability
+    // WiFi.setOutputPower(20.0); // in DBM
+
     connect();   // connect to WiFi
     ota_setup(); // initialize OTA
 
@@ -164,9 +170,8 @@ void Network::connect() {
 #endif
     }
 
-    if (!settings.wifi_ssid().empty()) {
-        WiFi.begin(settings.wifi_ssid().c_str(), settings.wifi_password().c_str());
-    }
+    LOG_INFO(F("Connecting to wifi ssid %s..."), settings.wifi_ssid().c_str());
+    WiFi.begin(settings.wifi_ssid().c_str(), settings.wifi_password().c_str());
 
 #endif
 }
diff --git a/src/system.cpp b/src/system.cpp
index eacf4075b..d9dc6e478 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -20,7 +20,6 @@
 #include "emsesp.h" // for send_raw_telegram() command
 
 MAKE_PSTR_WORD(syslog)
-MAKE_PSTR_WORD(interval)
 MAKE_PSTR_WORD(mark)
 MAKE_PSTR_WORD(level)
 MAKE_PSTR_WORD(host)
@@ -85,7 +84,6 @@ void System::mqtt_commands(const char * message) {
 // restart EMS-ESP
 // mode = safe mode. true to enable on next boot
 void System::restart(bool mode) {
-
     // check for safe mode
     if (mode) {
         LOG_NOTICE("Restarting system in safe mode...");
diff --git a/src/test/test_data.h b/src/test/test_data.h
index de01ba0ea..ea8d96f91 100644
--- a/src/test/test_data.h
+++ b/src/test/test_data.h
@@ -35,6 +35,15 @@ void EMSESP::run_test(uuid::console::Shell & shell, const std::string & command)
         return;
     }
 
+    if (command == "unknown2") {
+        // simulate getting version information back from an unknown device
+        uint8_t t[] = {0x09, 0x0B, 0x02, 0x00, 0x5A, 0x01, 0x02, 0x5A}; // product id is 90
+        rxservice_.add(t, sizeof(t));
+        rxservice_.loop();
+
+        return;
+    }
+
     if (command == "thermostats") {
         shell.printfln(F("Testing adding devices on the EMS bus..."));
 
diff --git a/src/thermostat.cpp b/src/thermostat.cpp
index 09000c3b9..1fafff48b 100644
--- a/src/thermostat.cpp
+++ b/src/thermostat.cpp
@@ -401,7 +401,7 @@ bool Thermostat::updated_values() {
     static uint16_t current_value_ = 0;
     for (const auto & hc : heating_circuits_) {
         // don't publish if we haven't yet received some data
-//        if ((hc->setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET) || (hc->curr_roomTemp == EMS_VALUE_SHORT_NOTSET)) {
+        //        if ((hc->setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET) || (hc->curr_roomTemp == EMS_VALUE_SHORT_NOTSET)) {
         if (hc->setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET) {
             return false;
         }
@@ -470,7 +470,7 @@ void Thermostat::publish_values() {
 
     // go through all the heating circuits
     for (const auto & hc : heating_circuits_) {
-//        if ((hc->setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET) || (hc->curr_roomTemp == EMS_VALUE_SHORT_NOTSET)) {
+        //        if ((hc->setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET) || (hc->curr_roomTemp == EMS_VALUE_SHORT_NOTSET)) {
         if (hc->setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET) {
             break; // skip this HC
         }
@@ -535,7 +535,7 @@ void Thermostat::publish_values() {
         if (hc->designtemp != EMS_VALUE_UINT_NOTSET) {
             dataThermostat["designtemp"] = hc->designtemp;
         }
-        if (hc->designtemp != EMS_VALUE_UINT_NOTSET) {
+        if (hc->summertemp != EMS_VALUE_UINT_NOTSET) {
             dataThermostat["summertemp"] = hc->summertemp;
         }
 
@@ -780,7 +780,7 @@ std::string Thermostat::mode_tostring(uint8_t mode) const {
 void Thermostat::show_values(uuid::console::Shell & shell) {
     EMSdevice::show_values(shell); // always call this to show header
 
-    char    buffer[10]; // for formatting only
+    char    buffer[10];                     // for formatting only
     uint8_t flags = (this->flags() & 0x0F); // specific thermostat characteristics, strip the option bits
 
     if (datetime_.size()) {
@@ -832,7 +832,6 @@ void Thermostat::show_values(uuid::console::Shell & shell) {
         }
     }
     if (flags == EMS_DEVICE_FLAG_RC35 || flags == EMS_DEVICE_FLAG_RC30_1) {
- 
         if (ibaCalIntTemperature != EMS_VALUE_INT_NOTSET) {
             print_value(shell, 2, F("Offset int. temperature"), F_(degrees), Helpers::render_value(buffer, ibaCalIntTemperature, 2));
         }
@@ -1056,7 +1055,7 @@ void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) {
     std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);
 
     telegram->read_value8(hc->setpoint_roomTemp, 2); // is * 2, force to single byte, is 0 in summermode
-    telegram->read_value(hc->curr_roomTemp, 3); // is * 10 - or 0x7D00 if thermostat is mounted on boiler
+    telegram->read_value(hc->curr_roomTemp, 3);      // is * 10 - or 0x7D00 if thermostat is mounted on boiler
     telegram->read_value(hc->mode_type, 1, 1);
     telegram->read_value(hc->summer_mode, 1, 0);
     telegram->read_value(hc->holiday_mode, 0, 5);
@@ -1341,13 +1340,13 @@ void Thermostat::set_temperature(const float temperature, const uint8_t mode, co
         case HeatingCircuit::Mode::OFFSET: // change the offset temp
             offset = EMS_OFFSET_RC35Set_temp_offset;
             break;
-        case HeatingCircuit::Mode::DESIGN: 
+        case HeatingCircuit::Mode::DESIGN:
             offset = EMS_OFFSET_RC35Set_temp_design;
             break;
-        case HeatingCircuit::Mode::SUMMER: 
+        case HeatingCircuit::Mode::SUMMER:
             offset = EMS_OFFSET_RC35Set_temp_summer;
             break;
-        case HeatingCircuit::Mode::NOFROST: 
+        case HeatingCircuit::Mode::NOFROST:
             offset = EMS_OFFSET_RC35Set_temp_nofrost;
             break;
         default:
@@ -1460,7 +1459,6 @@ void Thermostat::console_commands(Shell & shell, unsigned int context) {
                                        flash_string_vector{F_(degrees_mandatory), F_(hc_optional),F_(mode_optional)},
                                        [=](Shell & shell __attribute__((unused)), const std::vector<std::string> & arguments) {
                                             uint8_t hc = (arguments.size() >= 2) ? arguments[1].at(0) - '0' : DEFAULT_HEATING_CIRCUIT;
-                                            //uint8_t mode = (arguments.size() == 3) ? atoi(arguments.back().c_str()) : HeatingCircuit::Mode::AUTO;
                                             if ((arguments.size() == 3)) {
                                                 set_temperature(atof(arguments.front().c_str()), arguments.back().c_str(), hc);
                                             } else {
diff --git a/src/thermostat.h b/src/thermostat.h
index 8869ebed0..34c996682 100644
--- a/src/thermostat.h
+++ b/src/thermostat.h
@@ -46,22 +46,22 @@ class Thermostat : public EMSdevice {
         }
         ~HeatingCircuit() = default;
 
-        int16_t setpoint_roomTemp = EMS_VALUE_SHORT_NOTSET;
-        int16_t curr_roomTemp     = EMS_VALUE_SHORT_NOTSET;
-        uint8_t mode              = EMS_VALUE_UINT_NOTSET;
-        uint8_t mode_type         = EMS_VALUE_UINT_NOTSET;
-        uint8_t summer_mode       = EMS_VALUE_UINT_NOTSET;
-        uint8_t holiday_mode      = EMS_VALUE_UINT_NOTSET;
-        uint8_t daytemp           = EMS_VALUE_UINT_NOTSET;
-        uint8_t nighttemp         = EMS_VALUE_UINT_NOTSET;
-        uint8_t holidaytemp       = EMS_VALUE_UINT_NOTSET;
-        uint8_t heatingtype       = EMS_VALUE_UINT_NOTSET; // type of heating: 1 radiator, 2 convectors, 3 floors, 4 room supply
-        uint8_t circuitcalctemp   = EMS_VALUE_UINT_NOTSET;
-        uint8_t summertemp        = EMS_VALUE_UINT_NOTSET;
-        uint8_t nofrosttemp       = EMS_VALUE_UINT_NOTSET;
-        uint8_t designtemp        = EMS_VALUE_UINT_NOTSET; // heatingcurve design temp at MinExtTemp
-        int8_t  offsettemp        = EMS_VALUE_INT_NOTSET; // heatingcurve offest temp at roomtemp signed!
-        uint16_t remotetemp       = EMS_VALUE_SHORT_NOTSET; // for simulating a RC20 remote 
+        int16_t  setpoint_roomTemp = EMS_VALUE_SHORT_NOTSET;
+        int16_t  curr_roomTemp     = EMS_VALUE_SHORT_NOTSET;
+        uint8_t  mode              = EMS_VALUE_UINT_NOTSET;
+        uint8_t  mode_type         = EMS_VALUE_UINT_NOTSET;
+        uint8_t  summer_mode       = EMS_VALUE_UINT_NOTSET;
+        uint8_t  holiday_mode      = EMS_VALUE_UINT_NOTSET;
+        uint8_t  daytemp           = EMS_VALUE_UINT_NOTSET;
+        uint8_t  nighttemp         = EMS_VALUE_UINT_NOTSET;
+        uint8_t  holidaytemp       = EMS_VALUE_UINT_NOTSET;
+        uint8_t  heatingtype       = EMS_VALUE_UINT_NOTSET; // type of heating: 1 radiator, 2 convectors, 3 floors, 4 room supply
+        uint8_t  circuitcalctemp   = EMS_VALUE_UINT_NOTSET;
+        uint8_t  summertemp        = EMS_VALUE_UINT_NOTSET;
+        uint8_t  nofrosttemp       = EMS_VALUE_UINT_NOTSET;
+        uint8_t  designtemp        = EMS_VALUE_UINT_NOTSET;  // heatingcurve design temp at MinExtTemp
+        int8_t   offsettemp        = EMS_VALUE_INT_NOTSET;   // heatingcurve offest temp at roomtemp signed!
+        uint16_t remotetemp        = EMS_VALUE_SHORT_NOTSET; // for simulating a RC20 remote
 
 
         uint8_t hc_num() const {
diff --git a/src/uart/emsuart_esp32.cpp b/src/uart/emsuart_esp32.cpp
index b56b97e30..11ac5dc05 100644
--- a/src/uart/emsuart_esp32.cpp
+++ b/src/uart/emsuart_esp32.cpp
@@ -49,7 +49,7 @@ void EMSuart::emsuart_recvTask(void * para) {
             EMSESP::incoming_telegram(telegram, telegramSize);
             vRingbufferReturnItem(buf_handle, (void *)telegram);
         }
-   }
+    }
 }
 /*
  * UART interrupt, on break read the fifo and put the whole telegram to ringbuffer
@@ -60,7 +60,7 @@ void IRAM_ATTR EMSuart::emsuart_rx_intr_handler(void * para) {
 
     if (EMS_UART.int_st.brk_det) {
         EMS_UART.int_clr.brk_det = 1; // clear flag
-        length = 0;
+        length                   = 0;
         while (EMS_UART.status.rxfifo_cnt) {
             uint8_t rx = EMS_UART.fifo.rw_byte; // read all bytes from fifo
             if (length < EMS_MAXBUFFERSIZE) {
@@ -85,7 +85,7 @@ void EMSuart::start(uint8_t tx_mode) {
         restart();
         return;
     }
-    tx_mode_ = tx_mode;
+    tx_mode_                  = tx_mode;
     uart_config_t uart_config = {
         .baud_rate = EMSUART_BAUD,
         .data_bits = UART_DATA_8_BITS,
@@ -96,9 +96,9 @@ void EMSuart::start(uint8_t tx_mode) {
 
     ESP_ERROR_CHECK(uart_param_config(EMSUART_UART, &uart_config));
     ESP_ERROR_CHECK(uart_set_pin(EMSUART_UART, EMSUART_TXPIN, EMSUART_RXPIN, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE));
-    EMS_UART.int_ena.val             = 0; // disable all intr.
+    EMS_UART.int_ena.val             = 0;          // disable all intr.
     EMS_UART.int_clr.val             = 0xFFFFFFFF; // clear all intr. flags
-    EMS_UART.idle_conf.tx_brk_num    = 11; // breaklength 11 bit
+    EMS_UART.idle_conf.tx_brk_num    = 11;         // breaklength 11 bit
     EMS_UART.idle_conf.rx_idle_thrhd = 256;
     drop_next_rx                     = true;
     buf_handle                       = xRingbufferCreate(128, RINGBUF_TYPE_NOSPLIT);
@@ -119,8 +119,8 @@ void EMSuart::stop() {
  */
 void EMSuart::restart() {
     if (EMS_UART.int_raw.brk_det) {
-        EMS_UART.int_clr.brk_det = 1; // clear flag
-        drop_next_rx = true; // and drop first frame
+        EMS_UART.int_clr.brk_det = 1;    // clear flag
+        drop_next_rx             = true; // and drop first frame
     }
     EMS_UART.int_ena.brk_det = 1; // activate only break
 };
@@ -139,7 +139,7 @@ void EMSuart::send_poll(uint8_t data) {
  * returns code, 1=success
  */
 EMSUART_STATUS EMSuart::transmit(uint8_t * buf, uint8_t len) {
-    if (millis() -emsRxTime > EMS_RX_TO_TX_TIMEOUT) {
+    if (millis() - emsRxTime > EMS_RX_TO_TX_TIMEOUT) {
         return EMS_TX_WTD_TIMEOUT;
     }
     if (len > 0) {
diff --git a/src/uart/emsuart_esp32.h b/src/uart/emsuart_esp32.h
index 5a3a18189..4a2a9e289 100644
--- a/src/uart/emsuart_esp32.h
+++ b/src/uart/emsuart_esp32.h
@@ -41,7 +41,7 @@
 // customize the GPIO pins for RX and TX here
 #ifdef WEMOS_D1_32
 #define EMSUART_RXPIN 23 // 17 is UART2 RX. Use 23 for D7 on a Wemos D1-32 mini for backwards compatabilty
-#define EMSUART_TXPIN 5 // 16 is UART2 TX. Use 5 for D8 on a Wemos D1-32 mini for backwards compatabilty
+#define EMSUART_TXPIN 5  // 16 is UART2 TX. Use 5 for D8 on a Wemos D1-32 mini for backwards compatabilty
 #else
 #define EMSUART_RXPIN 17 // 17 is UART2 RX. Use 23 for D7 on a Wemos D1-32 mini for backwards compatabilty
 #define EMSUART_TXPIN 16 // 16 is UART2 TX. Use 5 for D8 on a Wemos D1-32 mini for backwards compatabilty
diff --git a/src/uart/emsuart_esp8266.cpp b/src/uart/emsuart_esp8266.cpp
index eb27cef33..86b5d9aee 100644
--- a/src/uart/emsuart_esp8266.cpp
+++ b/src/uart/emsuart_esp8266.cpp
@@ -54,7 +54,7 @@ void ICACHE_RAM_ATTR EMSuart::emsuart_rx_intr_handler(void * para) {
                 drop_next_rx = true;
             }
         }
-        USIC(EMSUART_UART) = (1 << UIBD); // INT clear the BREAK detect interrupt
+        USIC(EMSUART_UART) = (1 << UIBD);    // INT clear the BREAK detect interrupt
         USC0(EMSUART_UART) &= ~(1 << UCBRK); // reset tx-brk
         if (!drop_next_rx) {
             pEMSRxBuf->length = length;
@@ -91,7 +91,7 @@ void ICACHE_FLASH_ATTR EMSuart::emsuart_recvTask(os_event_t * events) {
     // ignore double BRK at the end, possibly from the Tx loopback
     // also telegrams with no data value
     // then transmit EMS buffer, excluding the BRK
-    if (length > 4)  {
+    if (length > 4) {
         EMSESP::incoming_telegram((uint8_t *)pCurrent->buffer, length - 1);
     }
 }
@@ -188,7 +188,7 @@ void ICACHE_FLASH_ATTR EMSuart::stop() {
 void ICACHE_FLASH_ATTR EMSuart::restart() {
     if (USIR(EMSUART_UART) & ((1 << UIBD))) {
         USIC(EMSUART_UART) = (1 << UIBD); // INT clear the BREAK detect interrupt
-        drop_next_rx      = true;
+        drop_next_rx       = true;
     }
     ETS_UART_INTR_ENABLE();
 }
@@ -249,7 +249,7 @@ EMSUART_STATUS ICACHE_FLASH_ATTR EMSuart::transmit(uint8_t * buf, uint8_t len) {
     if (len == 0) {
         return EMS_TX_STATUS_OK; // nothing to send
     }
-    if(millis() > (emsRxTime + EMS_RX_TO_TX_TIMEOUT)) { // send allowed within 20 ms
+    if (millis() > (emsRxTime + EMS_RX_TO_TX_TIMEOUT)) { // send allowed within 20 ms
         return EMS_TX_WTD_TIMEOUT;
     }
 
diff --git a/src/uart/emsuart_esp8266.h b/src/uart/emsuart_esp8266.h
index ecf1c3574..c92ea6fd5 100644
--- a/src/uart/emsuart_esp8266.h
+++ b/src/uart/emsuart_esp8266.h
@@ -47,7 +47,7 @@
 #define EMSUART_TX_LAG 8
 #define EMSUART_BUSY_WAIT (EMSUART_BIT_TIME / 8)
 #define EMS_TX_TO_CHARS (2 + 20)
-#define EMS_TX_TO_COUNT ((EMS_TX_TO_CHARS) * 8)
+#define EMS_TX_TO_COUNT ((EMS_TX_TO_CHARS)*8)
 
 namespace emsesp {
 
diff --git a/src/version.h b/src/version.h
index 4c1414bcc..efc44d9a0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "2.0.0a11"
+#define EMSESP_APP_VERSION "2.0.0a12"