diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index c8eb791b9..d241461ec 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1244,7 +1244,6 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	uint8_t anticoll_data[10] = { 0 };
 	uint8_t csn_data[10] = { 0 };
 	memcpy(csn_data, csn, sizeof(csn_data));
-	Dbprintf("[+] Simulating CSN %02x%02x%02x%02x%02x%02x%02x%02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
 
 	// Construct anticollision-CSN
 	rotateCSN(csn_data, anticoll_data);
@@ -1321,50 +1320,50 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 	// First card answer: SOF
 	CodeIClassTagSOF();
 	memcpy(resp_sof, ToSend, ToSendMax); resp_sof_Len = ToSendMax;
-	if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-		DbpString("SOF"); 
-		PrintToSendBuffer();
-	}
+	// if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+		// DbpString("SOF"); 
+		// PrintToSendBuffer();
+	// }
 	
 	// Anticollision CSN
 	CodeIClassTagAnswer(anticoll_data, sizeof(anticoll_data));
 	memcpy(resp_anticoll, ToSend, ToSendMax); resp_anticoll_len = ToSendMax;
-	if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-		DbpString("ANTI COLL CSN"); 
-		PrintToSendBuffer();
-	}
+	// if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+		// DbpString("ANTI COLL CSN"); 
+		// PrintToSendBuffer();
+	// }
 	
 	// CSN
 	CodeIClassTagAnswer(csn_data, sizeof(csn_data));
 	memcpy(resp_csn, ToSend, ToSendMax); resp_csn_len = ToSendMax;
-	if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-		DbpString("CSN");
-		PrintToSendBuffer();
-	}
+	// if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+		// DbpString("CSN");
+		// PrintToSendBuffer();
+	// }
 
 	// Configuration
 	CodeIClassTagAnswer(conf_data, sizeof(conf_data));
 	memcpy(resp_conf, ToSend, ToSendMax); resp_conf_len = ToSendMax;
-	if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-		DbpString("Configuration"); 
-		PrintToSendBuffer();
-	}
+	// if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+		// DbpString("Configuration"); 
+		// PrintToSendBuffer();
+	// }
 	
 	// e-Purse
 	CodeIClassTagAnswer(card_challenge_data, sizeof(card_challenge_data));
 	memcpy(resp_cc, ToSend, ToSendMax); resp_cc_len = ToSendMax;
-	if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-		DbpString("e-Purse"); 
-		PrintToSendBuffer();
-	}
+	// if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+		// DbpString("e-Purse"); 
+		// PrintToSendBuffer();
+	// }
 
 	// Application Issuer Area
 	CodeIClassTagAnswer(aia_data, sizeof(aia_data));
 	memcpy(resp_aia, ToSend, ToSendMax); resp_aia_len = ToSendMax;
-	if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
-		DbpString("Application Issuer Data"); 
-		PrintToSendBuffer();
-	}
+	// if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+		// DbpString("Application Issuer Data"); 
+		// PrintToSendBuffer();
+	// }
 
 	//This is used for responding to READ-block commands or other data which is dynamically generated
 	//First the 'trace'-data, not encoded for FPGA
@@ -1488,13 +1487,14 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) {
 				trace_data_size = 0;
 				
 				if (simulationMode == MODE_EXIT_AFTER_MAC) {
-
-					Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
-					Dbprintf("RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
+					
+					if ( MF_DBGLEVEL ==  MF_DBG_EXTENDED) {
+						Dbprintf("[+] CSN: %02x %02x %02x %02x %02x %02x %02x %02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
+						Dbprintf("[+] RDR:  (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len,
 							receivedCmd[0], receivedCmd[1], receivedCmd[2],
 							receivedCmd[3], receivedCmd[4], receivedCmd[5],
 							receivedCmd[6], receivedCmd[7], receivedCmd[8]);
-
+					}
 					if (reader_mac_buf != NULL)	{
 						memcpy(reader_mac_buf, receivedCmd+1, 8);
 					}
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ea807dabd..3a1ed437d 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -350,6 +350,8 @@ int CmdHFiClassSim(const char *Cmd) {
  * <4 byte NR><4 byte MAC>
  * CC are all zeroes, CSN is the same as was sent in
  **/
+	uint8_t tries = 0;
+			
 	switch(simType) {
 		
 		case 2: {
@@ -361,14 +363,17 @@ int CmdHFiClassSim(const char *Cmd) {
 			clearCommandBuffer();
 			SendCommand(&c);
 			
-			while (true) {
+			while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+				tries++;
+				printf(".");
+				fflush(stdout);
 				if (ukbhit()) {
 					int gc = getchar(); (void)gc;
 					PrintAndLog("[!] aborted via keyboard.");
 					return 0;
 				}
 
-				if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+				if ( tries > 20) {
 					PrintAndLog("[!] timeout while waiting for reply.");
 					return 0;
 				}
@@ -406,7 +411,7 @@ int CmdHFiClassSim(const char *Cmd) {
 			break;
 		}
 		case 4: {
-			PrintAndLog("[+] Starting the sim 4 keyroll attack");
+			PrintAndLog("[+] Starting the sim 4 key roll attack");
 			PrintAndLog("[+] press keyboard to cancel");
 			UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType, NUM_CSNS}};
 			UsbCommand resp = {0};
@@ -414,14 +419,17 @@ int CmdHFiClassSim(const char *Cmd) {
 			clearCommandBuffer();
 			SendCommand(&c);
 
-			while (true) {
+			while ( !WaitForResponseTimeout(CMD_ACK, &resp, 2000) ) {
+				tries++;
+				printf(".");
+				fflush(stdout);
 				if (ukbhit()) {
 					int gc = getchar(); (void)gc;
 					PrintAndLog("[!] aborted via keyboard.");
 					return 0;
 				}
 
-				if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+				if ( tries > 20) {
 					PrintAndLog("[!] timeout while waiting for reply.");
 					return 0;
 				}
diff --git a/client/mifarehost.c b/client/mifarehost.c
index b56ca0859..7067535a4 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -41,7 +41,6 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key) {
 			if (ukbhit()) {
 				int gc = getchar(); (void)gc;
 				return -5;
-				break;
 			}
 
 			UsbCommand resp;