diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c
index 6580af7fd..dc5c2e071 100644
--- a/armsrc/Standalone/hf_bog.c
+++ b/armsrc/Standalone/hf_bog.c
@@ -229,7 +229,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
     if (DBGLEVEL > 1)
         Dbprintf("[!] Wrote %u Authentification attempts into logfile", auth_attempts);
 
-    SpinErr(0, 200, 5); // blink led A
+    SpinErr(LED_A, 200, 5);
     SpinDelay(100);
 }
 
diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c
index 265b7e3c9..4997f775e 100644
--- a/armsrc/Standalone/hf_colin.c
+++ b/armsrc/Standalone/hf_colin.c
@@ -518,7 +518,7 @@ failtag:
     if (cjcuid == 0) {
         cjSetCursLeft();
         DbprintfEx(FLAG_NEWLINE, "%s>>%s BUG: 0000_CJCUID! Retrying...", _XRED_, _XWHITE_);
-        SpinErr(0, 100, 8);
+        SpinErr(LED_A, 100, 8);
         goto failtag;
     }
 
@@ -636,7 +636,7 @@ failtag:
         cjTabulize();
         DbprintfEx(FLAG_NEWLINE, "%s[ FAIL ]%s\r\n->did not found all the keys :'(", _XRED_, _XWHITE_);
         cjSetCursLeft();
-        SpinErr(1, 100, 8);
+        SpinErr(LEB_B, 100, 8);
         SpinOff(100);
         return;
     }
@@ -672,7 +672,7 @@ failtag:
             cjSetCursLeft();
 
             DbprintfEx(FLAG_NEWLINE, "FATAL:EML_FALLBACKFILL_B");
-            SpinErr(2, 100, 8);
+            SpinErr(LED_C, 100, 8);
             SpinOff(100);
             return;
         }
@@ -778,7 +778,7 @@ readysim:
     DbprintfEx(FLAG_NEWLINE, "- [ LA FIN ] -\r\n%s`-> You can take shell back :) ...", _XWHITE_);
     cjSetCursLeft();
     vtsend_set_attribute(NULL, 0);
-    SpinErr(3, 100, 16);
+    SpinErr(LED_D, 100, 16);
     SpinDown(75);
     SpinOff(100);
     return;
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 990ac1c56..a4b1c45bc 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -447,15 +447,12 @@ void SendCapabilities(void) {
 
 // Show some leds in a pattern to identify StandAlone mod is running
 void StandAloneMode(void) {
-
-    DbpString("Stand-alone mode! No PC necessary.");
-
+    DbpString("Stand-alone mode, no computer necessary");
     SpinDown(50);
-    SpinOff(50);
+    SpinDelay(50);
     SpinUp(50);
-    SpinOff(50);
+    SpinDelay(50);
     SpinDown(50);
-    SpinDelay(500);
 }
 
 /*
@@ -1215,7 +1212,11 @@ static void PacketReceived(PacketCommandNG *packet) {
             break;
         }
         case CMD_HF_ICLASS_READER: {
-            ReaderIClass(packet->oldarg[0]);
+            struct p {
+                uint8_t flags;
+            } PACKED;
+            struct p *payload = (struct p *)packet->data.asBytes;
+            ReaderIClass(payload->flags);
             break;
         }
         case CMD_HF_ICLASS_REPLAY: {
diff --git a/armsrc/util.c b/armsrc/util.c
index b855ab949..888c64b9d 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -90,6 +90,7 @@ void LEDsoff() {
     LED_D_OFF();
 }
 
+//ICEMAN:   LED went from 1,2,3,4 -> 1,2,4,8   
 void LED(int led, int ms) {
     if (led & LED_A) // Proxmark3 historical mapping: LED_ORANGE
         LED_A_ON();
@@ -123,26 +124,27 @@ void SpinOff(uint32_t pause) {
     SpinDelay(pause);
 }
 
-// 0=A, 1=B, 2=C, 3=D
+// Blinks..
+// A = 1, B = 2, C = 4, D = 8
 void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
     SpinOff(speed);
     NTIME(times) {
-        switch (led) {
-            case 0:
-                LED_A_INV();
-                break;
-            case 1:
-                LED_B_INV();
-                break;
-            case 2:
-                LED_C_INV();
-                break;
-            case 3:
-                LED_D_INV();
-                break;
-        }
+
+        if (led & LED_A) // Proxmark3 historical mapping: LED_ORANGE
+            LED_A_INV();
+        if (led & LED_B) // Proxmark3 historical mapping: LED_GREEN
+            LED_B_INV();
+        if (led & LED_C) // Proxmark3 historical mapping: LED_RED
+            LED_C_INV();
+        if (led & LED_D) // Proxmark3 historical mapping: LED_RED2
+            LED_D_INV();
+
         SpinDelay(speed);
     }
+    LED_A_OFF();
+    LED_B_OFF();
+    LED_C_OFF();
+    LED_D_OFF();
 }
 
 void SpinDown(uint32_t speed) {