diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index 82bdbf5d0..eaf5b5406 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -43,11 +43,11 @@ static int CmdHelp(const char *Cmd);
 static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
     { 0xAE, 0xA6, 0x84, 0xA6, 0xDA, 0xB2, 0x32, 0x78 },
     { 0x76, 0x65, 0x54, 0x43, 0x32, 0x21, 0x10, 0x00 },
-    { 0x5B, 0x7C, 0x62, 0xC4, 0x91, 0xc1, 0x1b, 0x39 },
     { 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87 },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
 };
 
@@ -3427,6 +3427,7 @@ static int CmdHFiClassPermuteKey(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
+/*
 static int CmdHFiClassAutopwn(const char *Cmd) {
 
     CLIParserContext *ctx;
@@ -3448,6 +3449,7 @@ static int CmdHFiClassAutopwn(const char *Cmd) {
     PrintAndLogEx(INFO, "to be implemented");
     return PM3_SUCCESS;
 }
+*/
 
 static command_t CommandTable[] = {
     {"-----------", CmdHelp,                    AlwaysAvailable, "--------------------- " _CYAN_("operations") " ---------------------"},
@@ -3463,7 +3465,7 @@ static command_t CommandTable[] = {
     {"wrbl",        CmdHFiClass_WriteBlock,     IfPm3Iclass,     "[options..] Write Picopass / iCLASS block"},
 
     {"-----------", CmdHelp,                    AlwaysAvailable, "--------------------- " _CYAN_("recovery") " ---------------------"},
-    {"autopwn",     CmdHFiClassAutopwn,         IfPm3Iclass,     "[options..] Automatic key recovery tool for iCLASS"},
+//    {"autopwn",     CmdHFiClassAutopwn,         IfPm3Iclass,     "[options..] Automatic key recovery tool for iCLASS"},
     {"chk",         CmdHFiClassCheckKeys,       IfPm3Iclass,     "[options..] Check keys"},
     {"loclass",     CmdHFiClass_loclass,        AlwaysAvailable, "[options..] Use loclass to perform bruteforce reader attack"},
     {"lookup",      CmdHFiClassLookUp,          AlwaysAvailable, "[options..] Uses authentication trace to check for key in dictionary file"},
diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c
index 93078178d..9abc2862c 100644
--- a/client/src/cmdlfem4x05.c
+++ b/client/src/cmdlfem4x05.c
@@ -429,7 +429,7 @@ int em4x05_clone_tag(uint32_t *blockdata, uint8_t numblocks, uint32_t pwd, bool
     }
 
     if (res == 0)
-        PrintAndLogEx(SUCCESS, "Success writing to tag");
+        PrintAndLogEx(SUCCESS, "Data written and verified");
 
     return PM3_SUCCESS;
 }
@@ -824,7 +824,7 @@ int CmdEM4x05Write(const char *Cmd) {
     uint32_t dummy = 0;
     int status = em4x05_demod_resp(&dummy, true);
     if (status == PM3_SUCCESS)
-        PrintAndLogEx(SUCCESS, "Success writing to tag");
+        PrintAndLogEx(SUCCESS, "Data written and verified");
     else if (status == PM3_EFAILED)
         PrintAndLogEx(ERR, "Tag denied %s operation", protectOperation ? "Protect" : "Write");
     else
@@ -1431,7 +1431,7 @@ static int unlock_write_protect(bool use_pwd, uint32_t pwd, uint32_t data, bool
     uint32_t dummy = 0;
     int status = em4x05_demod_resp(&dummy, true);
     if (status == PM3_SUCCESS && verbose)
-        PrintAndLogEx(SUCCESS, "Success writing to tag");
+        PrintAndLogEx(SUCCESS, "Data written and verified");
     else if (status == PM3_EFAILED)
         PrintAndLogEx(ERR, "Tag denied PROTECT operation");
     else
diff --git a/client/src/cmdlft55xx.c b/client/src/cmdlft55xx.c
index e34d14718..a3ccf2052 100644
--- a/client/src/cmdlft55xx.c
+++ b/client/src/cmdlft55xx.c
@@ -315,11 +315,13 @@ static int usage_t55xx_wipe(void) {
     PrintAndLogEx(NORMAL, "Options:");
     PrintAndLogEx(NORMAL, "     h               - this help");
     PrintAndLogEx(NORMAL, "     c <block0>      - set configuration from a block0");
+    PrintAndLogEx(NORMAL, "     p <password  - OPTIONAL password (8 hex characters)");
     PrintAndLogEx(NORMAL, "     q               - indicates to use Q5/T5555 default configuration block");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, "Examples:");
-    PrintAndLogEx(NORMAL, _YELLOW_("      lf t55xx wipe") "      -  wipes a T55x7 tag,    config block 0x000880E0");
-    PrintAndLogEx(NORMAL, _YELLOW_("      lf t55xx wipe q") "    -  wipes a Q5/T5555 tag, config block 0x6001F004");
+    PrintAndLogEx(NORMAL, _YELLOW_("      lf t55xx wipe") "              -  wipes a T55x7 tag,    config block 0x000880E0");
+    PrintAndLogEx(NORMAL, _YELLOW_("      lf t55xx wipe q") "            -  wipes a Q5/T5555 tag, config block 0x6001F004");
+    PrintAndLogEx(NORMAL, _YELLOW_("      lf t55xx wipe p 11223344") "   -  wipes a T55x7 tag,    config block 0x000880E0, using password");
     return PM3_SUCCESS;
 }
 static int usage_t55xx_deviceconfig(void) {
@@ -487,7 +489,7 @@ int clone_t55xx_tag(uint32_t *blockdata, uint8_t numblocks) {
     }
 
     if (res == 0)
-        PrintAndLogEx(SUCCESS, "Success writing to tag");
+        PrintAndLogEx(SUCCESS, "Data written and verified");
 
     return PM3_SUCCESS;
 }