diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index 974125946..0a35d5ea0 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -1848,93 +1848,117 @@ void SML_Decode(uint8_t index) {
                   cp += skip;
                 }
               }
-            } else if (!strncmp(mp,"UUuuUUuu",8)) {
-              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              ebus_dval=val;
-              mbus_dval=val;
-              mp+=8;
-              cp+=4;
-            } else if (*mp=='U' && *(mp+1)=='U' && *(mp+2)=='u' && *(mp+3)=='u'){
-              uint16_t val = cp[1]|(cp[0]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (!strncmp(mp,"SSssSSss",8)) {
-              int32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              ebus_dval=val;
-              mbus_dval=val;
-              mp+=8;
-              cp+=4;
-            } else if (*mp=='u' && *(mp+1)=='u' && *(mp+2)=='U' && *(mp+3)=='U'){
-              uint16_t val = cp[0]|(cp[1]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (*mp=='u' && *(mp+1)=='u') {
+            } else if (!strncmp(mp, "UUuuUUuu", 8)) {
+              uint32_t val = (cp[0]<<24) | (cp[1]<<16) | (cp[2]<<8) | (cp[3]<<0);
+              mp += 8;
+              cp += 4;
+              if (*mp == 's') {
+                mp++;
+                // swap words
+                val = (val>>16) | (val<<16);
+              }
+              ebus_dval = val;
+              mbus_dval = val;
+            } else if (!strncmp(mp, "uuUUuuUU", 8)) {
+              uint32_t val = (cp[1]<<24) | (cp[0]<<16) | (cp[3]<<8) | (cp[2]<<0);
+              mp += 8;
+              cp += 4;
+              if (*mp == 's') {
+                mp++;
+                // swap words
+                val = (val>>16) | (val<<16);
+              }
+              ebus_dval = val;
+              mbus_dval = val;
+            } else if (!strncmp(mp, "UUuu", 4)) {
+              uint16_t val = cp[1] | (cp[0]<<8);
+              mbus_dval = val;
+              ebus_dval = val;
+              mp += 4;
+              cp += 2;
+            } else if (!strncmp(mp, "SSssSSss", 8)) {
+              int32_t val = (cp[0]<<24) | (cp[1]<<16) | (cp[2]<<8) | (cp[3]<<0);
+              mp += 8;
+              cp += 4;
+              if (*mp == 's') {
+                mp++;
+                // swap words
+                val = ((uint32_t)val>>16) | ((uint32_t)val<<16);
+              }
+              ebus_dval = val;
+              mbus_dval = val;
+            } else if (!strncmp(mp, "ssSSssSS", 8)) {
+              int32_t val = (cp[1]<<24) | (cp[0]<<16) | (cp[3]<<8) | (cp[2]<<0);
+              mp += 8;
+              cp += 4;
+              if (*mp == 's') {
+                mp++;
+                // swap words
+                val = ((uint32_t)val>>16) | ((uint32_t)val<<16);
+              }
+              ebus_dval = val;
+              mbus_dval = val;
+            } else if (!strncmp(mp, "uuUU", 4)) {
+              uint16_t val = cp[0] | (cp[1]<<8);
+              mbus_dval = val;
+              ebus_dval = val;
+              mp += 4;
+              cp += 2;
+            } else if (!strncmp(mp, "uu", 2)) {
               uint8_t val = *cp++;
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=2;
-            } else if (*mp=='s' && *(mp+1)=='s' && *(mp+2)=='S' && *(mp+3)=='S') {
-              int16_t val = *cp|(*(cp+1)<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            } else if (*mp=='S' && *(mp+1)=='S' && *(mp+2)=='s' && *(mp+3)=='s') {
-              int16_t val = cp[1]|(cp[0]<<8);
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=4;
-              cp+=2;
-            }
-            else if (*mp=='s' && *(mp+1)=='s') {
+              mbus_dval = val;
+              ebus_dval = val;
+              mp += 2;
+            } else if (!strncmp(mp, "ssSS", 4)) {
+              int16_t val = *cp | (*(cp+1)<<8);
+              mbus_dval = val;
+              ebus_dval = val;
+              mp += 4;
+              cp += 2;
+            } else if (!strncmp(mp, "SSss", 4)) {
+              int16_t val = cp[1] | (cp[0]<<8);
+              mbus_dval = val;
+              ebus_dval = val;
+              mp += 4;
+              cp += 2;
+            } else if (!strncmp(mp,"ss", 2)) {
               int8_t val = *cp++;
-              mbus_dval=val;
-              ebus_dval=val;
-              mp+=2;
-            }
-            else if (!strncmp(mp,"ffffffff",8)) {
-              uint32_t val= (cp[0]<<24)|(cp[1]<<16)|(cp[2]<<8)|(cp[3]<<0);
-              float *fp=(float*)&val;
-              ebus_dval=*fp;
-              mbus_dval=*fp;
-              mp+=8;
-              cp+=4;
-            }
-            else if (!strncmp(mp,"FFffFFff",8)) {
+              mbus_dval = val;
+              ebus_dval = val;
+              mp += 2;
+            } else if (!strncmp(mp, "ffffffff", 8)) {
+              uint32_t val = (cp[0]<<24) | (cp[1]<<16) | (cp[2]<<8) | (cp[3]<<0);
+              float *fp = (float*)&val;
+              ebus_dval = *fp;
+              mbus_dval = *fp;
+              mp += 8;
+              cp += 4;
+            } else if (!strncmp(mp, "FFffFFff", 8)) {
               // reverse word float
-              uint32_t val= (cp[1]<<0)|(cp[0]<<8)|(cp[3]<<16)|(cp[2]<<24);
-              float *fp=(float*)&val;
-              ebus_dval=*fp;
-              mbus_dval=*fp;
-              mp+=8;
-              cp+=4;
-            }
-            else if (!strncmp(mp,"eeeeee",6)) {
-              uint32_t val=(cp[0]<<16)|(cp[1]<<8)|(cp[2]<<0);
-              mbus_dval=val;
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"vvvvvv",6)) {
-              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/10.0);
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"cccccc",6)) {
-              mbus_dval=(float)((cp[0]<<8)|(cp[1])) + ((float)cp[2]/100.0);
-              mp+=6;
-              cp+=3;
-            }
-            else if (!strncmp(mp,"pppp",4)) {
-              mbus_dval=(float)((cp[0]<<8)|cp[1]);
-              mp+=4;
-              cp+=2;
-            }
-            else if (*mp == 'v') {
+              uint32_t val = (cp[1]<<0) | (cp[0]<<8) | (cp[3]<<16) | (cp[2]<<24);
+              float *fp = (float*)&val;
+              ebus_dval = *fp;
+              mbus_dval = *fp;
+              mp += 8;
+              cp += 4;
+            } else if (!strncmp(mp, "eeeeee", 6)) {
+              uint32_t val = (cp[0]<<16) | (cp[1]<<8) | (cp[2]<<0);
+              mbus_dval = val;
+              mp += 6;
+              cp += 3;
+            } else if (!strncmp(mp, "vvvvvv", 6)) {
+              mbus_dval = (float)((cp[0]<<8) | (cp[1])) + ((float)cp[2]/10.0);
+              mp += 6;
+              cp += 3;
+            } else if (!strncmp(mp, "cccccc", 6)) {
+              mbus_dval = (float)((cp[0]<<8) | (cp[1])) + ((float)cp[2]/100.0);
+              mp += 6;
+              cp += 3;
+            } else if (!strncmp(mp, "pppp", 4)) {
+              mbus_dval = (float)((cp[0]<<8) | cp[1]);
+              mp += 4;
+              cp += 2;
+            } else if (*mp == 'v') {
               // vbus values vul, vsl, vuwh, vuwl, wswh, vswl, vswh
               // vub3, vsb3 etc
               mp++;
@@ -2411,7 +2435,7 @@ uint8_t sml_cnt_index[MAX_COUNTERS] =  { 0, 1, 2, 3 };
 void IRAM_ATTR SML_CounterIsr(void *arg) {
 uint32_t index = *static_cast<uint8_t*>(arg);
 
-uint32_t time = micros();
+uint32_t time = millis();
 uint32_t debounce_time;
 
   if (digitalRead(meter_desc_p[sml_counters[index].sml_cnt_old_state].srcpin) == bitRead(sml_counter_pinstate, index)) {
@@ -2420,15 +2444,15 @@ uint32_t debounce_time;
 
   debounce_time = time - sml_counters[index].sml_counter_ltime;
 
-  if (debounce_time <= sml_counters[index].sml_debounce * 1000) return;
+  if (debounce_time <= sml_counters[index].sml_debounce) return;
 
   if bitRead(sml_counter_pinstate, index) {
     // falling edge
     RtcSettings.pulse_counter[index]++;
-    sml_counters[index].sml_cnt_updated=1;
+    sml_counters[index].sml_cnt_updated = 1;
   }
   sml_counters[index].sml_counter_ltime = time;
-  sml_counter_pinstate ^= (1<<index);
+  sml_counter_pinstate ^= (1 << index);
 }
 
 
@@ -2797,9 +2821,10 @@ init10:
   // preloud counters
   for (byte i = 0; i < MAX_COUNTERS; i++) {
       RtcSettings.pulse_counter[i] = Settings->pulse_counter[i];
-      sml_counters[i].sml_cnt_last_ts=millis();
+      sml_counters[i].sml_cnt_last_ts = millis();
   }
   uint32_t uart_index = 2;
+  sml_counter_pinstate = 0;
   for (uint8_t meters = 0; meters < meters_used; meters++) {
     if (meter_desc_p[meters].type == 'c') {
         if (meter_desc_p[meters].flag & 2) {
@@ -2819,11 +2844,17 @@ init10:
           // check for irq mode
           if (meter_desc_p[meters].params<=0) {
             // init irq mode
-            attachInterruptArg(meter_desc_p[meters].srcpin, SML_CounterIsr,&sml_cnt_index[cindex], CHANGE);
-            sml_counters[cindex].sml_cnt_old_state=meters;
-            sml_counters[cindex].sml_debounce=-meter_desc_p[meters].params;
+            sml_counters[cindex].sml_cnt_old_state = meters;
+            sml_counters[cindex].sml_debounce = -meter_desc_p[meters].params;
+            attachInterruptArg(meter_desc_p[meters].srcpin, SML_CounterIsr, &sml_cnt_index[cindex], CHANGE);
+            if (digitalRead(meter_desc_p[meters].srcpin) > 0) {
+              sml_counter_pinstate |= (1 << cindex);
+            }
+            sml_counters[cindex].sml_counter_ltime = millis();
           }
-          InjektCounterValue(meters,RtcSettings.pulse_counter[cindex]);
+
+          RtcSettings.pulse_counter[cindex] = Settings->pulse_counter[cindex];
+          InjektCounterValue(meters, RtcSettings.pulse_counter[cindex]);
           cindex++;
         }
     } else {