diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index b5c13f4f2..1d4240fc7 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -649,7 +649,7 @@ int CmdHF14AInfo(const char *Cmd) {
         else if (res == 0)
             PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("HARD"));
         else
-            PrintAndLogEx(FAILED, "prng detection:  " _RED_("failed"));
+            PrintAndLogEx(FAILED, "prng detection:  " _RED_("Fail"));
 
         if (do_nack_test)
             detect_classic_nackbug(silent);
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 15cd6a9fe..9760b3e1a 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -252,7 +252,7 @@ int CmdLegicInfo(const char *Cmd) {
             stamp_len = 0xfc - data[6];
         }
 
-        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
+        PrintAndLogEx(NORMAL, "DCF: %d (%02x %02x), Token Type=" _YELLOW_("%s") " (OLE=%01u), OL=%02u, FL=%02u",
                       dcf,
                       data[5],
                       data[6],
@@ -468,7 +468,7 @@ int CmdLegicInfo(const char *Cmd) {
             }
         }
 
-        if ( i > 0 ) {
+        if ( remain_seg_payload_len > 0 ) {
             PrintAndLogEx(NORMAL, "Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
             PrintAndLogEx(NORMAL, "\nrow  | data");
             PrintAndLogEx(NORMAL, "-----+------------------------------------------------");
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 773fff29a..95ef6ca82 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -745,7 +745,7 @@ uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool
                          );
         }
 
-        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_("Passed") : _RED_("Failed"));
+        PrintAndLogEx(SUCCESS, "Parity checks | %s", (pTest) ? _GREEN_("Passed") : _RED_("Fail"));
     }
     return code;
 }
@@ -944,7 +944,7 @@ int EM4x50Read(const char *Cmd, bool verbose) {
             PrintAndLogEx(NORMAL, "Block %d: %08x", block, Code[block]);
         }
 
-        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_("Passed") : _RED_("Failed"));
+        PrintAndLogEx(NORMAL, "Parities checks | %s", (AllPTest) ? _GREEN_("Passed") : _RED_("Fail"));
 
         if (AllPTest == 0) {
             PrintAndLogEx(NORMAL, "Try cleaning the read samples with " _YELLOW_("'data askedge'"));
@@ -1202,7 +1202,7 @@ static int CmdEM4x05Read(const char *Cmd) {
     if (isOk)
         PrintAndLogEx(NORMAL, "Address %02d | %08X - %s", addr, word, (addr > 13) ? "Lock" : "");
     else
-        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_("failed"), addr);
+        PrintAndLogEx(NORMAL, "Read Address %02d | " _RED_("Fail"), addr);
     return isOk;
 }
 
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 510c38e4a..027f12895 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -157,7 +157,7 @@ static int CmdFDXBdemodBI(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU:      %u", reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag:        %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Passed") : "Failed");
+    PrintAndLogEx(SUCCESS, "CRC:           0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Passed") : _RED_("Fail") );
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
@@ -226,7 +226,7 @@ static int CmdFdxDemod(const char *Cmd) {
     PrintAndLogEx(SUCCESS, "Reserved/RFU       %u (0x04%X)", reservedCode,  reservedCode);
     PrintAndLogEx(SUCCESS, "Animal Tag         %s", animalBit ? _YELLOW_("True") : "False");
     PrintAndLogEx(SUCCESS, "Has extended data  %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
-    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : "Failed");
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X - 0x%04X [%s]", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Ok") : _RED_("Fail") );
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %d", preambleIndex, size);
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 3212f4454..d8f029d05 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -414,7 +414,7 @@ static void printHitagConfiguration(uint8_t config) {
     if (config & 0x10) {
         strcat(msg + strlen(msg), "read only");
     } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -424,7 +424,7 @@ static void printHitagConfiguration(uint8_t config) {
     if (config & 0x20) {
         strcat(msg + strlen(msg), "read only");
     } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -434,7 +434,7 @@ static void printHitagConfiguration(uint8_t config) {
     if (config & 0x40) {
         strcat(msg + strlen(msg), "read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
     } else  {
-        strcat(msg + strlen(msg), _GREEN_("read write"));
+        strcat(msg + strlen(msg), _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     memset(msg, 0, sizeof(msg));
@@ -450,7 +450,7 @@ static void printHitagConfiguration(uint8_t config) {
             strcat(msg + strlen(msg), "read only");
         }
     } else  {
-        strcat(msg, "Page 1,2    : " _GREEN_("read write"));
+        strcat(msg, "Page 1,2    : " _GREEN_("RW"));
     }
     PrintAndLogEx(SUCCESS, "%s", msg);
     PrintAndLogEx(INFO, "------------------------------------");
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 420ab4d29..7a09c75ff 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -102,7 +102,7 @@ static int CmdJablotronDemod(const char *Cmd) {
     uint8_t chksum = raw2 & 0xFF;
     PrintAndLogEx(INFO, "Checksum: %02X [%s]",
                   chksum,
-                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_("OK") : _RED_("FAIL")
+                  (chksum == jablontron_chksum(DemodBuffer)) ? _GREEN_("OK") : _RED_("Fail")
                  );
 
     id = DEC2BCD(id);
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 135b35650..6f46700d6 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -182,7 +182,7 @@ static int CmdPyramidDemod(const char *Cmd) {
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - %02X - %s"
                   , checksum
                   , checkCS
-                  , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Failed")
+                  , (checksum == checkCS) ? _GREEN_("Passed") : _RED_("Fail")
                  );
 
     PrintAndLogEx(DEBUG, "DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index d43f87e50..fc468dde0 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -252,7 +252,7 @@ static int CmdTIDemod(const char *Cmd) {
 
         //crc =  crc16_ccitt(message, sizeof(message);
 
-        const char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Failed");
+        const char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Fail");
 
         PrintAndLogEx(INFO, "Tag data = %08X%08X  [Crc %04X %s]", shift1, shift0, crc, crcStr);
 
diff --git a/client/emv/emv_roca.c b/client/emv/emv_roca.c
index c0d0d419d..df43db4ee 100644
--- a/client/emv/emv_roca.c
+++ b/client/emv/emv_roca.c
@@ -154,7 +154,7 @@ int roca_self_test(void) {
         PrintAndLogEx(SUCCESS, "Weak modulus [ %s]", _GREEN_("PASS"));
     } else {
         ret++;
-        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_("FAIL"));
+        PrintAndLogEx(FAILED, "Weak modulus [ %s]", _RED_("Fail"));
     }
 
     // negative
@@ -165,7 +165,7 @@ int roca_self_test(void) {
 
     if (emv_rocacheck(keyn, 64, false)) {
         ret++;
-        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_("FAIL"));
+        PrintAndLogEx(FAILED, "Strong modulus [ %s]", _RED_("Fail"));
     } else {
         PrintAndLogEx(SUCCESS, "Strong modulus [ %s]", _GREEN_("PASS"));
     }
diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 4bb49f039..29c4fdaa3 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -97,7 +97,7 @@ int ExecuteCryptoTests(bool verbose) {
     PrintAndLogEx(NORMAL, "\n--------------------------");
 
     if (TestFail)
-        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_("FAIL"));
+        PrintAndLogEx(FAILED, "\tTest(s) [ %s ]", _RED_("Fail"));
     else
         PrintAndLogEx(SUCCESS, "\tTest(s) [ %s ]", _GREEN_("OK"));