diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73306b1f..993dd636 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
 - Changed all command line parsers in `hf emv` commands to argtable (Merlok)
+- Implemented AppNap API, fixing #283 and #627 OSX USB comm issues (AntiCat)
 
 ### Added
 - Added `sc` smartcard (contact card) commands - reader, info, raw, upgrade, setclock, list (hardware version RDV4.0 only) must turn option on in makefile options (Willok, Iceman, marshmellow)
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index c092b383..9b0ab29e 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -67,6 +67,8 @@
 
 #define arraylen(x) (sizeof(x)/sizeof((x)[0]))
 
+static int DEBUG = 0;
+
 ///////////////////////////////////////////////////////////////////////
 // ISO 15693 Part 2 - Air Interface
 // This section basicly contains transmission and receiving of bits
@@ -82,10 +84,10 @@
 #define sprintUID(target,uid)	Iso15693sprintUID(target,uid)
 
 // approximate amplitude=sqrt(ci^2+cq^2) 
-#define AMPLITUDE(ci, cq) (MAX(ABS(ci), ABS(cq)) + (MIN(ABS(ci), ABS(cq))>>1))
-
-static int DEBUG = 0;
+#define AMPLITUDE(ci, cq) (MAX(ABS(ci), ABS(cq)) + MIN(ABS(ci), ABS(cq))/2)
 
+// DMA buffer
+#define ISO15693_DMA_BUFFER_SIZE 128
 
 // ---------------------------
 // Signal Processing 
@@ -168,13 +170,15 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n)
 	ToSendStuffBit(0);
 	ToSendStuffBit(1);
 
-	// And slack at the end, too.
-	for(i = 0; i < 24; i++) {
+	// Fill remainder of last byte with 1
+	for(i = 0; i < 4; i++) {
 		ToSendStuffBit(1);
 	}
+	
+	ToSendMax++;
 }
 
-// encode data using "1 out of 256" sheme
+// encode data using "1 out of 256" scheme
 // data rate is 1,66 kbit/s (fc/8192) 
 // is designed for more robust communication over longer distances
 static void CodeIso15693AsReader256(uint8_t *cmd, int n)
@@ -222,224 +226,349 @@ static void CodeIso15693AsReader256(uint8_t *cmd, int n)
 }
 
 
-// Transmit the command (to the tag) that was placed in ToSend[].
-static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *wait)
+// Transmit the command (to the tag) that was placed in cmd[].
+static void TransmitTo15693Tag(const uint8_t *cmd, int len)
 {
-    int c;
-
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_TX);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
-	if(*wait < 10) { *wait = 10; }
 
-    c = 0;
-    for(;;) {
+	LED_B_ON();
+    for(int c = 0; c < len; ) {
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = ~cmd[c];
             c++;
-            if(c >= len) {
-                break;
-            }
-        }
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-            volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
-            (void)r;
         }
         WDT_HIT();
     }
-	*samples = (c + *wait) << 3;
+	LED_B_OFF();
 }
 
 //-----------------------------------------------------------------------------
-// Transmit the command (to the reader) that was placed in ToSend[].
+// Transmit the command (to the reader) that was placed in cmd[].
 //-----------------------------------------------------------------------------
-static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int *wait)
+static void TransmitTo15693Reader(const uint8_t *cmd, int len)
 {
-    int c = 0;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K);
-	if(*wait < 10) { *wait = 10; }
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
 
-    for(;;) {
+	LED_C_ON();
+    for(int c = 0; c < len; ) {
         if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
             AT91C_BASE_SSC->SSC_THR = cmd[c];
             c++;
-            if(c >= len) {
-                break;
-            }
-        }
-        if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-            volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
-            (void)r;
         }
         WDT_HIT();
     }
-	*samples = (c + *wait) << 3;
+	LED_C_OFF();
 }
 
 
-// Read from Tag
-// Parameters:
-//		receivedResponse
-//		maxLen
-//		samples
-//		elapsed
-// returns: 
-//		number of decoded bytes
-static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
+//=============================================================================
+// An ISO 15693 demodulator (one subcarrier only). Uses cross correlation to 
+// identify the SOF, each bit, and EOF.
+// This function is called 8 times per bit (every 2 subcarrier cycles).
+// Subcarrier frequency fs is 424kHz, 1/fs = 2,36us, 
+// i.e. function is called every 4,72us
+// LED handling:
+//    LED C -> ON once we have received the SOF and are expecting the rest.
+//    LED C -> OFF once we have received EOF or are unsynced
+//
+// Returns: true if we received a EOF
+//          false if we are still waiting for some more
+//=============================================================================
+
+#define SUBCARRIER_DETECT_THRESHOLD	2
+#define SOF_CORRELATOR_LEN (1<<5)
+
+typedef struct Demod {
+	enum {
+		DEMOD_UNSYNCD,
+		DEMOD_AWAIT_SOF_1,
+		DEMOD_AWAIT_SOF_2,
+		DEMOD_RECEIVING_DATA,
+		DEMOD_AWAIT_EOF
+	}         state;
+	int       bitCount;
+	int       posCount;
+	enum {
+		LOGIC0,
+		LOGIC1,
+		SOF_PART1,
+		SOF_PART2
+	}         lastBit;
+	uint16_t  shiftReg;
+	uint8_t   *output;
+	int       len;
+	int       sum1, sum2;
+	uint8_t   SOF_low;
+	uint8_t   SOF_high;
+	uint8_t   SOF_last;
+	int32_t   SOF_corr;
+	int32_t   SOF_corr_prev;
+	uint8_t   SOF_correlator[SOF_CORRELATOR_LEN];
+} Demod_t;
+
+static RAMFUNC int Handle15693SamplesDemod(int8_t ci, int8_t cq, Demod_t *Demod)
 {
-	int c = 0;
-	uint8_t *dest = BigBuf_get_addr();
-
-// NOW READ RESPONSE
-	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
-	c = 0;
-	for(;;) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			uint16_t iq = AT91C_BASE_SSC->SSC_RHR;
-			// The samples are correlations against I and Q versions of the
-			// tone that the tag AM-modulates. We just want power. 
-			int8_t i = iq >> 8;
-			int8_t q = iq;
-			uint8_t r = AMPLITUDE(i, q);
-
-			dest[c++] = r;
+	switch(Demod->state) {
+		case DEMOD_UNSYNCD:
+			// initialize SOF correlator. We are looking for 12 samples low and 12 samples high.
+			Demod->SOF_low = 0;
+			Demod->SOF_high = 12;
+			Demod->SOF_last = 23;
+			memset(Demod->SOF_correlator, 0x00, Demod->SOF_last + 1);
+			Demod->SOF_correlator[Demod->SOF_last] = AMPLITUDE(ci,cq);
+			Demod->SOF_corr = Demod->SOF_correlator[Demod->SOF_last];
+			Demod->SOF_corr_prev = Demod->SOF_corr;
+			// initialize Demodulator
+			Demod->posCount = 0;
+			Demod->bitCount = 0;
+			Demod->len = 0;
+			Demod->state = DEMOD_AWAIT_SOF_1;
+			break;
 			
-			if(c >= 4000) {
-				break;
-			}
-		}
-	}
+		case DEMOD_AWAIT_SOF_1:
+			// calculate the correlation in real time. Look at differences only.
+			Demod->SOF_corr += Demod->SOF_correlator[Demod->SOF_low++];
+			Demod->SOF_corr -= 2*Demod->SOF_correlator[Demod->SOF_high++];
+			Demod->SOF_last++;
+			Demod->SOF_low &= (SOF_CORRELATOR_LEN-1);
+			Demod->SOF_high &= (SOF_CORRELATOR_LEN-1);
+			Demod->SOF_last &= (SOF_CORRELATOR_LEN-1);
+			Demod->SOF_correlator[Demod->SOF_last] = AMPLITUDE(ci,cq);
+			Demod->SOF_corr += Demod->SOF_correlator[Demod->SOF_last];
 
-	//////////////////////////////////////////
-	/////////// DEMODULATE ///////////////////
-	//////////////////////////////////////////
-
-	int i, j;
-	int max = 0, maxPos=0;
-
-	int skip = 2;
-
-	// First, correlate for SOF
-	for(i = 0; i < 200; i++) {  // usually, SOF is found around i = 60
-		int corr = 0;
-		for(j = 0; j < arraylen(FrameSOF); j += skip) {
-			corr += FrameSOF[j]*dest[i+(j/skip)];
-		}
-		if(corr > max) {
-			max = corr;
-			maxPos = i;
-		}
-	}
-	if (DEBUG) Dbprintf("SOF at %d, correlation %d", maxPos, max/(arraylen(FrameSOF)/skip));
-
-	int k = 0; // this will be our return value
-
-	// greg - If correlation is less than 1 then there's little point in continuing
-	if ((max/(arraylen(FrameSOF)/skip)) >= 1)
-	{
-
-		i = maxPos + arraylen(FrameSOF)/skip;
-	
-		uint8_t outBuf[20];
-		memset(outBuf, 0, sizeof(outBuf));
-		uint8_t mask = 0x01;
-		for(;;) {
-			int corr0 = 0, corr00 = 0, corr01 = 0, corr1 = 0, corrEOF = 0;
-			for(j = 0; j < arraylen(Logic0); j += skip) {
-				corr0 += Logic0[j]*dest[i+(j/skip)];
-			}
-			corr01 = corr00 = corr0;
-			for(j = 0; j < arraylen(Logic0); j += skip) {
-				corr00 += Logic0[j]*dest[i+arraylen(Logic0)/skip+(j/skip)];
-				corr01 += Logic1[j]*dest[i+arraylen(Logic0)/skip+(j/skip)];
-			}
-			for(j = 0; j < arraylen(Logic1); j += skip) {
-				corr1 += Logic1[j]*dest[i+(j/skip)];
-			}
-			for(j = 0; j < arraylen(FrameEOF); j += skip) {
-				corrEOF += FrameEOF[j]*dest[i+(j/skip)];
-			}
-			// Even things out by the length of the target waveform.
-			corr00 *= 2;
-			corr01 *= 2;
-			corr0 *= 4;
-			corr1 *= 4;
-	
-			if(corrEOF > corr1 && corrEOF > corr00 && corrEOF > corr01) {
-				if (DEBUG) Dbprintf("EOF at %d, correlation %d (corr01: %d, corr00: %d, corr1: %d, corr0: %d)", 
-					i, corrEOF, corr01, corr00, corr1, corr0);
-				break;
-			} else if(corr1 > corr0) {
-				i += arraylen(Logic1)/skip;
-				outBuf[k] |= mask;
+			// if correlation increases for 10 consecutive samples, we are close to maximum correlation
+			if (Demod->SOF_corr > Demod->SOF_corr_prev + SUBCARRIER_DETECT_THRESHOLD) {
+				Demod->posCount++;
 			} else {
-				i += arraylen(Logic0)/skip;
+				Demod->posCount = 0;
 			}
-			mask <<= 1;
-			if(mask == 0) {
-				k++;
-				mask = 0x01;
-			}
-			if((i+(int)arraylen(FrameEOF)/skip) >= 4000) {
-				DbpString("ran off end!");
-				break;
-			}
-		}
-		if(mask != 0x01) { // this happens, when we miss the EOF
-			// TODO: for some reason this happens quite often
-			if (DEBUG) Dbprintf("error, uneven octet! (extra bits!) mask=%02x", mask);
-			if (mask<0x08) k--; // discard the last uneven octet;
-			// 0x08 is an assumption - but works quite often
-		}
-	//	uint8_t str1 [8];
-	//	itoa(k,str1);
-	//	strncat(str1," octets read",8);
-	
-	//	DbpString(  str1);    // DbpString("%d octets", k);
-	
-	//	for(i = 0; i < k; i+=3) {
-	//		//DbpString("# %2d: %02x ", i, outBuf[i]);
-	//		DbpIntegers(outBuf[i],outBuf[i+1],outBuf[i+2]);
-	//	}
-	
-		for(i = 0; i < k; i++) {
-			receivedResponse[i] = outBuf[i];
-		}
-	} // "end if correlation > 0" 	(max/(arraylen(FrameSOF)/skip))
-	return k; // return the number of bytes demodulated
 
-///	DbpString("CRC=%04x", Iso15693Crc(outBuf, k-2));
+			if (Demod->posCount == 10) {	// correlation increased 10 times
+				Demod->state = DEMOD_AWAIT_SOF_2;
+			}
+				
+			Demod->SOF_corr_prev = Demod->SOF_corr;
+				
+			break;
 
+		case DEMOD_AWAIT_SOF_2:
+			// calculate the correlation in real time. Look at differences only.
+			Demod->SOF_corr += Demod->SOF_correlator[Demod->SOF_low++];
+			Demod->SOF_corr -= 2*Demod->SOF_correlator[Demod->SOF_high++];
+			Demod->SOF_last++;
+			Demod->SOF_low &= (SOF_CORRELATOR_LEN-1);
+			Demod->SOF_high &= (SOF_CORRELATOR_LEN-1);
+			Demod->SOF_last &= (SOF_CORRELATOR_LEN-1);
+			Demod->SOF_correlator[Demod->SOF_last] = AMPLITUDE(ci,cq);
+			Demod->SOF_corr += Demod->SOF_correlator[Demod->SOF_last];
+
+			if (Demod->SOF_corr >= Demod->SOF_corr_prev) { // we are looking for the maximum correlation
+				Demod->SOF_corr_prev = Demod->SOF_corr;
+			} else {
+				Demod->lastBit = SOF_PART1;  // detected 1st part of SOF
+				Demod->sum1 = Demod->SOF_correlator[Demod->SOF_last];
+				Demod->sum2 = 0;
+				Demod->posCount = 2;
+				Demod->state = DEMOD_RECEIVING_DATA;
+				LED_C_ON();
+			}
+			
+			break;
+
+		case DEMOD_RECEIVING_DATA:
+			if (Demod->posCount == 1) {
+				Demod->sum1 = 0;
+				Demod->sum2 = 0;
+			}
+
+			if (Demod->posCount <= 4) {
+				Demod->sum1 += AMPLITUDE(ci, cq);
+			} else {
+				Demod->sum2 += AMPLITUDE(ci, cq);
+			}
+
+			if (Demod->posCount == 8) {
+				int16_t corr_1 = (Demod->sum2 - Demod->sum1) / 4;
+				int16_t corr_0 = (Demod->sum1 - Demod->sum2) / 4;
+				int16_t corr_EOF = (Demod->sum1 + Demod->sum2) / 8;
+				if (corr_EOF > corr_0 && corr_EOF > corr_1) {
+					Demod->state = DEMOD_AWAIT_EOF;
+				} else if (corr_1 > corr_0) {
+					// logic 1
+					if (Demod->lastBit == SOF_PART1) { // still part of SOF
+						Demod->lastBit = SOF_PART2;
+					} else {
+						Demod->lastBit = LOGIC1;
+						Demod->shiftReg >>= 1;
+						Demod->shiftReg |= 0x80;
+						Demod->bitCount++;
+						if (Demod->bitCount == 8) {
+							Demod->output[Demod->len] = Demod->shiftReg;
+							Demod->len++;
+							Demod->bitCount = 0;
+							Demod->shiftReg = 0;
+						}
+					}
+				} else {
+					// logic 0
+					if (Demod->lastBit == SOF_PART1) { // incomplete SOF
+						Demod->state = DEMOD_UNSYNCD;
+						LED_C_OFF();
+					} else {
+						Demod->lastBit = LOGIC0;
+						Demod->shiftReg >>= 1;
+						Demod->bitCount++;
+						if (Demod->bitCount == 8) {
+							Demod->output[Demod->len] = Demod->shiftReg;
+							Demod->len++;
+							Demod->bitCount = 0;
+							Demod->shiftReg = 0;
+						}
+					}
+				}
+				Demod->posCount = 0;
+			}
+			Demod->posCount++;
+			break;
+		
+		case DEMOD_AWAIT_EOF:
+			if (Demod->lastBit == LOGIC0) {  // this was already part of EOF 
+				LED_C_OFF();
+				return true;
+			} else {
+				Demod->state = DEMOD_UNSYNCD;
+				LED_C_OFF();
+			}
+			break;
+
+		default:
+			Demod->state = DEMOD_UNSYNCD;
+			LED_C_OFF();
+			break;
+	}
+
+	return false;
+}
+
+
+static void DemodInit(Demod_t* Demod, uint8_t* data)
+{
+	Demod->output = data;
+	Demod->state = DEMOD_UNSYNCD;
+}
+
+
+/*
+ *  Demodulate the samples we received from the tag, also log to tracebuffer
+ */
+static int GetIso15693AnswerFromTag(uint8_t* response, int timeout)
+{
+	int maxBehindBy = 0;
+	int lastRxCounter, samples = 0;
+	int8_t ci, cq;
+	bool gotFrame = false;
+	
+	// Allocate memory from BigBuf for some buffers
+	// free all previous allocations first
+	BigBuf_free();
+
+	// The DMA buffer, used to stream samples from the FPGA
+	uint16_t* dmaBuf = (uint16_t*) BigBuf_malloc(ISO15693_DMA_BUFFER_SIZE * sizeof(uint16_t));
+
+	// the Demodulatur data structure
+	Demod_t* Demod = (Demod_t*) BigBuf_malloc(sizeof(Demod_t));
+	
+	// Set up the demodulator for tag -> reader responses.
+	DemodInit(Demod, response);
+
+	// wait for last transfer to complete
+	while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY));
+
+	// And put the FPGA in the appropriate mode
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+
+	// Setup and start DMA.
+	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
+	FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+
+	uint16_t *upTo = dmaBuf;
+	lastRxCounter = ISO15693_DMA_BUFFER_SIZE;
+
+	for(;;) {
+		int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) & (ISO15693_DMA_BUFFER_SIZE-1);
+		if(behindBy > maxBehindBy) {
+			maxBehindBy = behindBy;
+		}
+
+		if (behindBy < 1) continue;
+		
+		ci = (int8_t)(*upTo >> 8);
+		cq = (int8_t)(*upTo & 0xff);
+
+		upTo++;
+		lastRxCounter--;
+		if(upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                // we have read all of the DMA buffer content.
+			upTo = dmaBuf;                                             // start reading the circular buffer from the beginning
+			lastRxCounter += ISO15693_DMA_BUFFER_SIZE;
+		}
+		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_ENDRX)) {              // DMA Counter Register had reached 0, already rotated.
+			AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) dmaBuf;          // refresh the DMA Next Buffer and
+			AT91C_BASE_PDC_SSC->PDC_RNCR = ISO15693_DMA_BUFFER_SIZE;   // DMA Next Counter registers
+		}
+		samples++;
+
+		if (Handle15693SamplesDemod(ci, cq, Demod)) {
+			gotFrame = true;
+			break;
+		}
+
+		if(samples > timeout && Demod->state < DEMOD_RECEIVING_DATA) {
+			Demod->len = 0;
+			break;
+		}
+	}
+
+	FpgaDisableSscDma();
+
+	if (DEBUG) Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.state = %d, Demod.len = %d, Demod.bitCount = %d, Demod.posCount = %d", 
+	                    maxBehindBy, samples, gotFrame, Demod->state, Demod->len, Demod->bitCount, Demod->posCount);
+
+	if (tracing && Demod->len > 0) {
+		uint8_t parity[MAX_PARITY_SIZE];
+		LogTrace(Demod->output, Demod->len, 0, 0, parity, false);
+	}
+
+	return Demod->len;
 }
 
 
 // Now the GetISO15693 message from sniffing command
+// TODO: fix it. This cannot work for several reasons: 
+//   1. Carrier is switched on during sniffing?
+//   2. We most probable miss the next reader command when demodulating
 static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed)
 {
-	int c = 0;
 	uint8_t *dest = BigBuf_get_addr();
 
 // NOW READ RESPONSE
+	LED_D_ON();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	//spindelay(60);	// greg - experiment to get rid of some of the 0 byte/failed reads
-	c = 0;
-	for(;;) {
+	for(int c = 0; c < BIGBUF_SIZE; ) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			uint16_t iq = AT91C_BASE_SSC->SSC_RHR;
 			// The samples are correlations against I and Q versions of the
 			// tone that the tag AM-modulates. We just want power, 
 			// so abs(I) + abs(Q) is close to what we want.
-			int8_t i = iq >> 8;
-			int8_t q = iq;
+			int8_t i = (int8_t)(iq >> 8);
+			int8_t q = (int8_t)(iq & 0xff);
 			uint8_t r = AMPLITUDE(i, q);
-
 			dest[c++] = r;
-
-			if(c >= BIGBUF_SIZE) {
-				break;
-			}
 		}
 	}
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LED_D_OFF();
 
 	//////////////////////////////////////////
 	/////////// DEMODULATE ///////////////////
@@ -461,6 +590,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
 			maxPos = i;
 		}
 	}
+
 	if (DEBUG) Dbprintf("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));
 
 	int k = 0; // this will be our return value
@@ -498,7 +628,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
 	
 			if(corrEOF > corr1 && corrEOF > corr00 && corrEOF > corr01) {
 				if (DEBUG) Dbprintf("EOF at %d, correlation %d (corr01: %d, corr00: %d, corr1: %d, corr0: %d)", 
-					i, corrEOF, corr01, corr00, corr1, corr0);
+				         i, corrEOF, corr01, corr00, corr1, corr0);
 				break;
 			} else if(corr1 > corr0) {
 				i += arraylen(Logic1)/skip;
@@ -549,16 +679,18 @@ static void BuildIdentifyRequest(void);
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void)
 {
+	LEDsoff();
+	LED_A_ON();
+	
 	uint8_t *dest = BigBuf_get_addr();
 
-	int c = 0;
-
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	BuildIdentifyRequest();
 
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
 	// Give the tags time to energize
+	LED_D_ON();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	SpinDelay(100);
 
@@ -566,48 +698,51 @@ void AcquireRawAdcSamplesIso15693(void)
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_TX);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
 
-	c = 0;
-	for(;;) {
+	LED_B_ON();
+	for(int c = 0; c < ToSendMax; ) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = ~ToSend[c];
 			c++;
-			if(c == ToSendMax+3) {
-				break;
-			}
 		}
 		WDT_HIT();
 	}
+	LED_B_OFF();
+
+	// wait for last transfer to complete
+	while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY));
 
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-	c = 0;
-	for(;;) {
+	for(int c = 0; c < 4000; ) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			uint16_t iq = AT91C_BASE_SSC->SSC_RHR;
 			// The samples are correlations against I and Q versions of the
 			// tone that the tag AM-modulates. We just want power, 
 			// so abs(I) + abs(Q) is close to what we want.
-			int8_t i = iq >> 8;
-			int8_t q = iq;
+			int8_t i = (int8_t)(iq >> 8);
+			int8_t q = (int8_t)(iq & 0xff);
 			uint8_t r = AMPLITUDE(i, q);
-
 			dest[c++] = r;
-
-			if(c >= 4000) {
-				break;
-			}
 		}
 	}
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
 }
 
 
+// TODO: there is no trigger condition. The 14000 samples represent a time frame of 66ms. 
+// It is unlikely that we get something meaningful.
+// TODO: Currently we only record tag answers. Add tracing of reader commands.
+// TODO: would we get something at all? The carrier is switched on...
 void RecordRawAdcSamplesIso15693(void)
 {
+	LEDsoff();
+	LED_A_ON();
+	
 	uint8_t *dest = BigBuf_get_addr();
 
-	int c = 0;
-
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	// Setup SSC
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
@@ -620,43 +755,38 @@ void RecordRawAdcSamplesIso15693(void)
 
 	SpinDelay(100);
 
+	LED_D_ON();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-	c = 0;
-	for(;;) {
+	for(int c = 0; c < 14000;) {
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
 			uint16_t iq = AT91C_BASE_SSC->SSC_RHR;
 			// The samples are correlations against I and Q versions of the
 			// tone that the tag AM-modulates. We just want power, 
 			// so abs(I) + abs(Q) is close to what we want.
-			int8_t i = iq >> 8;
-			int8_t q = iq;
+			int8_t i = (int8_t)(iq >> 8);
+			int8_t q = (int8_t)(iq & 0xff);
 			uint8_t r = AMPLITUDE(i, q);
-
 			dest[c++] = r;
-
-			if(c >= 14000) {
-				break;
-			}
 		}
 	}
+
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LED_D_OFF();
 	Dbprintf("finished recording");
+	LED_A_OFF();
 }
 
 
 // Initialize the proxmark as iso15k reader 
 // (this might produces glitches that confuse some tags
-void Iso15693InitReader() {
-	LED_A_ON();
-	LED_B_ON();
-	LED_C_OFF();
-	LED_D_OFF();
-	
+static void Iso15693InitReader() {
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	// Setup SSC
 	// FpgaSetupSsc();
 
 	// Start from off (no field generated)
+	LED_D_OFF();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	SpinDelay(10);
 
@@ -664,18 +794,14 @@ void Iso15693InitReader() {
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
 	// Give the tags time to energize
+	LED_D_ON();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	SpinDelay(250);
-
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
 }
 
 ///////////////////////////////////////////////////////////////////////
 // ISO 15693 Part 3 - Air Interface
-// This section basicly contains transmission and receiving of bits
+// This section basically contains transmission and receiving of bits
 ///////////////////////////////////////////////////////////////////////
 
 // Encode (into the ToSend buffers) an identify request, which is the first
@@ -732,8 +858,9 @@ static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
 	CodeIso15693AsReader(cmd, sizeof(cmd));
 }
 
+
 // Now the VICC>VCD responses when we are simulating a tag
- static void BuildInventoryResponse( uint8_t *uid)
+static void BuildInventoryResponse( uint8_t *uid)
 {
 	uint8_t cmd[12];
 
@@ -766,17 +893,11 @@ static void BuildReadBlockRequest(uint8_t *uid, uint8_t blockNumber )
 // 	**recv will return you a pointer to the received data
 // 	If you do not need the answer use NULL for *recv[] 
 //	return: lenght of received data
-int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv) {
+int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t **recv) {
 
-	int samples = 0;
-	int tsamples = 0;
-	int wait = 0;
-	int elapsed = 0;
-	
 	LED_A_ON();
-	LED_B_ON();
+	LED_B_OFF();
 	LED_C_OFF();
-	LED_D_OFF();
 	
 	if (init) Iso15693InitReader();
 
@@ -792,22 +913,14 @@ int SendDataTag(uint8_t *send, int sendlen, int init, int speed, uint8_t **recv)
 		CodeIso15693AsReader(send, sendlen);
 	}
 	
-	LED_A_ON();
-	LED_B_OFF();
-	
-	TransmitTo15693Tag(ToSend,ToSendMax,&tsamples, &wait);	
+	TransmitTo15693Tag(ToSend,ToSendMax);	
 	// Now wait for a response
 	if (recv!=NULL) {
-		LED_A_OFF();
-		LED_B_ON();
-		answerLen = GetIso15693AnswerFromTag(answer, 100, &samples, &elapsed) ;	
+		answerLen = GetIso15693AnswerFromTag(answer, 100);	
 		*recv=answer;
 	}
 
 	LED_A_OFF();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
 	
 	return answerLen;
 }
@@ -887,35 +1000,21 @@ void SetDebugIso15693(uint32_t debug) {
 	return;
 }
 
-
-
 //-----------------------------------------------------------------------------
 // Simulate an ISO15693 reader, perform anti-collision and then attempt to read a sector
 // all demodulation performed in arm rather than host. - greg
 //-----------------------------------------------------------------------------
 void ReaderIso15693(uint32_t parameter)
 {
+	LEDsoff();
 	LED_A_ON();
-	LED_B_ON();
-	LED_C_OFF();
-	LED_D_OFF();
 
 	int answerLen1 = 0;
-	int answerLen2 = 0;
-	// int answerLen3 = 0;
-	int i = 0;
-	int samples = 0;
-	int tsamples = 0;
-	int wait = 0;
-	int elapsed = 0;
 	uint8_t TagUID[8] = {0x00};
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
 	uint8_t *answer1 = BigBuf_get_addr() + 4000;
-	uint8_t *answer2 = BigBuf_get_addr() + 4100;
-	// uint8_t *answer3 = BigBuf_get_addr() + 4200;
-	// Blank arrays
 	memset(answer1, 0x00, 200);
 
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
@@ -927,24 +1026,20 @@ void ReaderIso15693(uint32_t parameter)
    	SpinDelay(200);
 
 	// Give the tags time to energize
+	LED_D_ON();
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	SpinDelay(200);
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
-
 	// FIRST WE RUN AN INVENTORY TO GET THE TAG UID
 	// THIS MEANS WE CAN PRE-BUILD REQUESTS TO SAVE CPU TIME
 
 	// Now send the IDENTIFY command
 	BuildIdentifyRequest();
 	
-	TransmitTo15693Tag(ToSend,ToSendMax,&tsamples, &wait);
+	TransmitTo15693Tag(ToSend,ToSendMax);
 	
 	// Now wait for a response
-	answerLen1 = GetIso15693AnswerFromTag(answer1, 100, &samples, &elapsed) ;
+	answerLen1 = GetIso15693AnswerFromTag(answer1, 100) ;
 
 	if (answerLen1 >=12) // we should do a better check than this
 	{
@@ -964,7 +1059,7 @@ void ReaderIso15693(uint32_t parameter)
 	Dbhexdump(answerLen1,answer1,true);
 
 	// UID is reverse
-	if (answerLen1>=12) 
+	if (answerLen1 >= 12) 
 		Dbprintf("UID = %02hX%02hX%02hX%02hX%02hX%02hX%02hX%02hX",
 			TagUID[7],TagUID[6],TagUID[5],TagUID[4],
 			TagUID[3],TagUID[2],TagUID[1],TagUID[0]);
@@ -979,12 +1074,13 @@ void ReaderIso15693(uint32_t parameter)
 	// Dbhexdump(answerLen3,answer3,true);
 
 	// read all pages
-	if (answerLen1>=12 && DEBUG) {
-		i=0;			
+	if (answerLen1 >= 12 && DEBUG) {
+		uint8_t *answer2 = BigBuf_get_addr() + 4100;
+		int i=0;			
 		while (i<32) {  // sanity check, assume max 32 pages
 			BuildReadBlockRequest(TagUID,i);
-			TransmitTo15693Tag(ToSend,ToSendMax,&tsamples, &wait);  
-			answerLen2 = GetIso15693AnswerFromTag(answer2, 100, &samples, &elapsed);
+			TransmitTo15693Tag(ToSend,ToSendMax);  
+			int answerLen2 = GetIso15693AnswerFromTag(answer2, 100);
 			if (answerLen2>0) {
 				Dbprintf("READ SINGLE BLOCK %d returned %d octets:",i,answerLen2);
 				DbdecodeIso15693Answer(answerLen2,answer2);
@@ -995,25 +1091,23 @@ void ReaderIso15693(uint32_t parameter)
 		} 
 	}
 
-	LED_A_OFF();
-	LED_B_OFF();
-	LED_C_OFF();
+	// for the time being, switch field off to protect rdv4.0 
+	// note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
+   	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_D_OFF();
+	
+	LED_A_OFF();
 }
 
 // Simulate an ISO15693 TAG, perform anti-collision and then print any reader commands
 // all demodulation performed in arm rather than host. - greg
 void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 {
+	LEDsoff();
 	LED_A_ON();
-	LED_B_ON();
-	LED_C_OFF();
-	LED_D_OFF();
 
 	int answerLen1 = 0;
 	int samples = 0;
-	int tsamples = 0;
-	int wait = 0;
 	int elapsed = 0;
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -1028,11 +1122,6 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
    	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	SpinDelay(200);
 
-	LED_A_OFF();
-	LED_B_OFF();
-	LED_C_ON();
-	LED_D_OFF();
-
 	// Listen to reader
 	answerLen1 = GetIso15693AnswerFromSniff(buf, 100, &samples, &elapsed) ;
 
@@ -1043,7 +1132,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 		
 		BuildInventoryResponse(uid);
 	
-		TransmitTo15693Reader(ToSend,ToSendMax, &tsamples, &wait);
+		TransmitTo15693Reader(ToSend,ToSendMax);
 	}
 
 	Dbprintf("%d octets read from reader command: %x %x %x %x %x %x %x %x %x", answerLen1,
@@ -1054,10 +1143,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 		uid[0], uid[1], uid[2],	uid[3],
 		uid[4], uid[5],	uid[6], uid[7]);
 
-	LED_A_OFF();
-	LED_B_OFF();
-	LED_C_OFF();
-	LED_D_OFF();
+	LEDsoff();
 }
 
 
@@ -1065,6 +1151,9 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 // (some manufactures offer a way to read the AFI, though)
 void BruteforceIso15693Afi(uint32_t speed) 
 {	
+	LEDsoff();
+	LED_A_ON();
+	
 	uint8_t data[20];
 	uint8_t *recv=data;
 	int datalen=0, recvlen=0;
@@ -1079,7 +1168,7 @@ void BruteforceIso15693Afi(uint32_t speed)
 	data[1]=ISO15_CMD_INVENTORY;
 	data[2]=0; // mask length
 	datalen=AddCrc(data,3);
-	recvlen=SendDataTag(data,datalen,0,speed,&recv);
+	recvlen=SendDataTag(data, datalen, false, speed, &recv);
 	WDT_HIT();
 	if (recvlen>=12) {
 		Dbprintf("NoAFI UID=%s",sprintUID(NULL,&recv[2]));
@@ -1096,7 +1185,7 @@ void BruteforceIso15693Afi(uint32_t speed)
 	for (int i=0;i<256;i++) {
 		data[2]=i & 0xFF;
 		datalen=AddCrc(data,4);
-		recvlen=SendDataTag(data,datalen,0,speed,&recv);
+		recvlen=SendDataTag(data, datalen, false, speed, &recv);
 		WDT_HIT();
 		if (recvlen>=12) {
 			Dbprintf("AFI=%i UID=%s",i,sprintUID(NULL,&recv[2]));
@@ -1104,26 +1193,27 @@ void BruteforceIso15693Afi(uint32_t speed)
 	}	
 	Dbprintf("AFI Bruteforcing done.");
 	
+   	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
 }
 
 // Allows to directly send commands to the tag via the client
-void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8_t data[]) {
+void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t data[]) {
 
 	int recvlen=0;
 	uint8_t *recvbuf = BigBuf_get_addr();
-//	UsbCommand n;
+	
+	LED_A_ON();
 	
 	if (DEBUG) {
 		Dbprintf("SEND");
 		Dbhexdump(datalen,data,true);
 	}
 	
-	recvlen=SendDataTag(data,datalen,1,speed,(recv?&recvbuf:NULL));
+	recvlen = SendDataTag(data, datalen, true, speed, (recv?&recvbuf:NULL));
 
 	if (recv) { 
-		LED_B_ON();
-		cmd_send(CMD_ACK,recvlen>48?48:recvlen,0,0,recvbuf,48);
-		LED_B_OFF();	
+		cmd_send(CMD_ACK, recvlen>48?48:recvlen, 0, 0, recvbuf, 48);
 		
 		if (DEBUG) {
 			Dbprintf("RECV");
@@ -1132,6 +1222,12 @@ void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8
 		}
 	}
 
+	// for the time being, switch field off to protect rdv4.0 
+	// note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
+   	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LED_D_OFF();
+	
+	LED_A_OFF();
 }
 
 
diff --git a/client/Makefile b/client/Makefile
index 931df81f..f1007b89 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -37,10 +37,12 @@ endif
 LUAPLATFORM = generic
 platform = $(shell uname)
 ifneq (,$(findstring MINGW,$(platform)))
-    LUAPLATFORM = mingw
+		LUAPLATFORM = mingw
 else
 	ifeq ($(platform),Darwin)
 		LUAPLATFORM = macosx
+		OBJCSRCS = util_darwin.m
+		LDFLAGS += -framework Foundation -framework AppKit
 	else
 		LUALIB +=  -ldl
 		LDLIBS +=  -ltermcap -lncurses
@@ -211,6 +213,7 @@ QTGUISRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp guidummy.cpp
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+OBJCOBJS = $(OBJCSRCS:%.m=$(OBJDIR)/%.o)
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \
 			$(MULTIARCHSRCS:%.c=$(OBJDIR)/%_MMX.o) \
@@ -236,7 +239,7 @@ endif
 			
 BINS = proxmark3 flasher fpga_compress
 WINBINS = $(patsubst %, %.exe, $(BINS))
-CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
+CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
 
 # need to assign dependancies to build these first...
 all: lua_build jansson_build $(BINS)
@@ -245,10 +248,10 @@ all-static: LDLIBS:=-static $(LDLIBS)
 all-static: proxmark3 flasher fpga_compress
 
 proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua
-	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS) -o $@
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua
+	$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS) -o $@
 
-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS)
 	$(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
@@ -311,6 +314,10 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 	$(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $<
 	$(POSTCOMPILE)
 
+%.o: %.m
+$(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
+	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(POSTCOMPILE)
 
 #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d
 #	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
@@ -326,6 +333,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d
 
 DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(CORESRCS) $(CMDSRCS) $(ZLIBSRCS) $(MULTIARCHSRCS)) \
 	$(patsubst %.cpp, $(OBJDIR)/%.d, $(QTGUISRCS)) \
+	$(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS)) \
 	$(OBJDIR)/proxmark3.d $(OBJDIR)/flash.d $(OBJDIR)/flasher.d $(OBJDIR)/fpga_compress.d
 
 $(DEPENDENCY_FILES): ;
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index b6a84c1c..c116b001 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -373,7 +373,8 @@ int CmdHF15Read(const char *Cmd)
 	return 0;
 }
 
-// Record Activity without enabeling carrier
+// Record Activity without enabling carrier
+// TODO: currently it DOES enable the carrier
 int CmdHF15Record(const char *Cmd)
 {
 	UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693};
@@ -519,7 +520,7 @@ static command_t CommandTable15[] =
 	{"cmd",     CmdHF15Cmd,     0, "Send direct commands to ISO15693 tag"},
 	{"findafi", CmdHF15Afi,     0, "Brute force AFI of an ISO15693 tag"},
 	{"dumpmemory", CmdHF15DumpMem,     0, "Read all memory pages of an ISO15693 tag"},
-		{NULL, NULL, 0, NULL}
+	{NULL, NULL, 0, NULL}
 };
 
 int CmdHF15(const char *Cmd)
@@ -572,9 +573,9 @@ int CmdHF15CmdInquiry(const char *Cmd)
 
 // Turns debugging on(1)/off(0)
 int CmdHF15CmdDebug( const char *cmd) {
-	int debug=atoi(cmd);
-	if (strlen(cmd)<1) {
-		PrintAndLog("Usage: hf 15 cmd debug  <0|1>");
+	int debug = atoi(cmd);
+	if (strlen(cmd) < 1) {
+		PrintAndLog("Usage: hf 15 debug <0|1>");
 		PrintAndLog("	0 no debugging");
 		PrintAndLog("	1 turn debugging on");	
 		return 0;
diff --git a/client/comms.c b/client/comms.c
index 2030f8f3..190b9110 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -18,6 +18,7 @@
 #include "uart.h"
 #include "ui.h"
 #include "common.h"
+#include "util_darwin.h"
 #include "util_posix.h"
 
 
@@ -198,6 +199,10 @@ __attribute__((force_align_arg_pointer))
 	UsbCommand rx;
 	UsbCommand *prx = &rx;
 
+#if defined(__MACH__) && defined(__APPLE__)
+	disableAppNap("Proxmark3 polling UART");
+#endif
+
 	while (conn->run) {
 		rxlen = 0;
 		bool ACK_received = false;
@@ -236,6 +241,10 @@ __attribute__((force_align_arg_pointer))
 		pthread_mutex_unlock(&txBufferMutex);
 	}
 
+#if defined(__MACH__) && defined(__APPLE__)
+	enableAppNap();
+#endif
+
 	pthread_exit(NULL);
 	return NULL;
 }
@@ -333,7 +342,20 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 
 void CloseProxmark(void) {
 	conn.run = false;
+
+#ifdef __BIONIC__
+	// In Android O and later, if an invalid pthread_t is passed to pthread_join, it calls fatal().
+	// https://github.com/aosp-mirror/platform_bionic/blob/ed16b344e75f422fb36fbfd91fb30de339475880/libc/bionic/pthread_internal.cpp#L116-L128
+	//
+	// In Bionic libc, pthread_t is an integer.
+
+	if (USB_communication_thread != 0) {
+		pthread_join(USB_communication_thread, NULL);
+	}
+#else
+	// pthread_t is a struct on other libc, treat as an opaque memory reference
 	pthread_join(USB_communication_thread, NULL);
+#endif
 
 	if (sp) {
 		uart_close(sp);
@@ -351,6 +373,9 @@ void CloseProxmark(void) {
 	// Clean up our state
 	sp = NULL;
 	serial_port_name = NULL;
+#ifdef __BIONIC__
+	memset(&USB_communication_thread, 0, sizeof(pthread_t));
+#endif
 }
 
 
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 23cc5d9c..1c945130 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -16,6 +16,31 @@
 #include "cliparser/cliparser.h"
 #include <jansson.h>
 
+bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
+	int buflen = 0;	
+	
+	switch(param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
+	case 1:
+		PrintAndLog("%s Invalid HEX value.", errormsg);
+		return false;
+	case 2:
+		PrintAndLog("%s Hex value too large.", errormsg);
+		return false;
+	case 3:
+		PrintAndLog("%s Hex value must have even number of digits.", errormsg);
+		return false;
+	}
+	
+	if (buflen > maxbufferlen) {
+		PrintAndLog("%s HEX length (%d) more than %d", errormsg, *bufferlen, maxbufferlen);
+		return false;
+	}
+	
+	*bufferlen = buflen;
+	
+	return true;
+}
+
 #define TLV_ADD(tag, value)( tlvdb_change_or_add_node(tlvRoot, tag, sizeof(value) - 1, (const unsigned char *)value) )
 void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 	//9F02:(Amount, authorized (Numeric)) len:6
@@ -37,6 +62,111 @@ void ParamLoadDefaults(struct tlvdb *tlvRoot) {
 	TLV_ADD(0x9F66, "\x26\x00\x00\x00"); // qVSDC
 }
 
+bool ParamLoadFromJson(struct tlvdb *tlv) {
+	json_t *root;
+	json_error_t error;
+
+	if (!tlv) {
+		PrintAndLog("ERROR load params: tlv tree is NULL.");
+		return false; 
+	}
+
+	// current path + file name
+	const char *relfname = "emv/defparams.json"; 
+	char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
+	strcpy(fname, get_my_executable_directory());
+	strcat(fname, relfname);
+
+	root = json_load_file(fname, 0, &error);
+	if (!root) {
+		PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
+		return false; 
+	}
+	
+	if (!json_is_array(root)) {
+		PrintAndLog("Load params: Invalid json format. root must be array.");
+		return false; 
+	}
+	
+	PrintAndLog("Load params: json OK");
+	
+	for(int i = 0; i < json_array_size(root); i++) {
+		json_t *data, *jtype, *jlength, *jvalue;
+
+		data = json_array_get(root, i);
+		if(!json_is_object(data))
+		{
+			PrintAndLog("Load params: data [%d] is not an object", i + 1);
+			json_decref(root);
+			return false;
+		}
+		
+		jtype = json_object_get(data, "type");
+		if(!json_is_string(jtype))
+		{
+			PrintAndLog("Load params: data [%d] type is not a string", i + 1);
+			json_decref(root);
+			return false;
+		}
+		const char *tlvType = json_string_value(jtype);
+
+		jvalue = json_object_get(data, "value");
+		if(!json_is_string(jvalue))
+		{
+			PrintAndLog("Load params: data [%d] value is not a string", i + 1);
+			json_decref(root);
+			return false;
+		}
+		const char *tlvValue = json_string_value(jvalue);
+
+		jlength = json_object_get(data, "length");
+		if(!json_is_number(jlength))
+		{
+			PrintAndLog("Load params: data [%d] length is not a number", i + 1);
+			json_decref(root);
+			return false;
+		}
+		
+		int tlvLength = json_integer_value(jlength);
+		if (tlvLength > 250) {
+			PrintAndLog("Load params: data [%d] length more than 250", i + 1);
+			json_decref(root);
+			return false;
+		}
+		
+		PrintAndLog("TLV param: %s[%d]=%s", tlvType, tlvLength, tlvValue);
+		uint8_t buf[251] = {0};
+		size_t buflen = 0;
+		
+		// here max length must be 4, but now tlv_tag_t is 2-byte var. so let it be 2 by now...  TODO: needs refactoring tlv_tag_t...
+		if (!HexToBuffer("TLV Error type:", tlvType, buf, 2, &buflen)) { 
+			json_decref(root);
+			return false;
+		}
+		tlv_tag_t tag = 0;
+		for (int i = 0; i < buflen; i++) {
+			tag = (tag << 8) + buf[i];
+		}	
+		
+		if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {
+			json_decref(root);
+			return false;
+		}
+		
+		if (buflen != tlvLength) {
+			PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
+			json_decref(root);
+			return false;
+		}
+		
+		tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);		
+	}
+
+	json_decref(root);
+
+	return true;
+}
+
 int CmdHFEMVSelect(const char *cmd) {
 	uint8_t data[APDU_AID_LEN] = {0};
 	int datalen = 0;
@@ -185,14 +315,14 @@ int CmdHFEMVGPO(const char *cmd) {
 	CLIParserInit("hf emv gpo", 
 		"Executes Get Processing Options command. It returns data in TLV format (0x77 - format2) or plain format (0x80 - format1).\nNeeds a EMV applet to be selected.", 
 		"Usage:\n\thf emv gpo -k -> execute GPO\n"
-			"\thf emv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"); 
-			// here need to add load params from file and gen pdol
+			"\thf emv gpo -t 01020304 -> execute GPO with 4-byte PDOL data, show result in TLV\n"
+			"\thf emv gpo -pmt 9F 37 04 -> load params from file, make PDOL data from PDOL, execute GPO with PDOL, show result in TLV\n"); 
 
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("kK",  "keep",    "keep field ON for next command"),
-		arg_lit0("pP",  "params",  "load parameters for PDOL making from `emv/defparams.json` file (by default uses default parameters) (NOT WORK!!!)"),
-		arg_lit0("mM",  "make",    "make PDOLdata from PDOL (tag 9F38) and parameters (NOT WORK!!!)"),
+		arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for PDOLdata making from PDOL and parameters"),
+		arg_lit0("mM",  "make",    "make PDOLdata from PDOL (tag 9F38) and parameters (by default uses default parameters)"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
 		arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
@@ -222,21 +352,23 @@ int CmdHFEMVGPO(const char *cmd) {
 		.value = (uint8_t *)data,
 	};
 	if (dataMakeFromPDOL) {
-		// TODO
-		PrintAndLog("Make PDOL data not implemented!");
-
 		ParamLoadDefaults(tlvRoot);
 
 		if (paramsLoadFromFile) {
+			PrintAndLog("Params loading from file...");
+			ParamLoadFromJson(tlvRoot);
 		};
-/*		pdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x9f38, NULL), tlvRoot, 0x83);
+		
+		pdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f38, datalen, data), tlvRoot, 0x83);
 		if (!pdol_data_tlv){
 			PrintAndLog("ERROR: can't create PDOL TLV.");
 			tlvdb_free(tlvRoot);
 			return 4;
-		}*/
-		return 0;
+		}
 	} else {
+		if (paramsLoadFromFile) {
+			PrintAndLog("WARNING: don't need to load parameters. Sending plain PDOL data...");
+		}
 		pdol_data_tlv = &data_tlv;
 	}
 
@@ -255,7 +387,8 @@ int CmdHFEMVGPO(const char *cmd) {
 	uint16_t sw = 0;
 	int res = EMVGPO(leaveSignalON, pdol_data_tlv_data, pdol_data_tlv_data_len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
-	free(pdol_data_tlv_data);
+	if (pdol_data_tlv != &data_tlv)
+		free(pdol_data_tlv);
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
@@ -328,16 +461,19 @@ int CmdHFEMVAC(const char *cmd) {
 		"Generate Application Cryptogram command. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
 		"Usage:\n\thf emv genac -k 0102 -> generate AC with 2-byte CDOLdata and keep field ON after command\n"
 			"\thf emv genac -t 01020304 -> generate AC with 4-byte CDOL data, show result in TLV\n"
-			"\thf emv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"); 
+			"\thf emv genac -Daac 01020304 -> generate AC with 4-byte CDOL data and terminal decision 'declined'\n"
+			"\thf emv genac -pmt 9F 37 04 -> load params from file, make CDOL data from CDOL, generate AC with CDOL, show result in TLV"); 
 
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("kK",  "keep",     "keep field ON for next command"),
 		arg_lit0("cC",  "cda",      "executes CDA transaction. Needs to get SDAD in results."),
 		arg_str0("dD",  "decision", "<aac|tc|arqc>", "Terminal decision. aac - declined, tc - approved, arqc - online authorisation requested"),
+		arg_lit0("pP",  "params",   "load parameters from `emv/defparams.json` file for CDOLdata making from CDOL and parameters"),
+		arg_lit0("mM",  "make",     "make CDOLdata from CDOL (tag 8C and 8D) and parameters (by default uses default parameters)"),
 		arg_lit0("aA",  "apdu",     "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",      "TLV decode results of selected applets"),
-		arg_strx1(NULL,  NULL,      "<HEX CDOLdata>", NULL),
+		arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
@@ -362,9 +498,11 @@ int CmdHFEMVAC(const char *cmd) {
 	}
 	if (trTypeCDA)
 		termDecision = termDecision | EMVAC_CDAREQ;
-	bool APDULogging = arg_get_lit(4);
-	bool decodeTLV = arg_get_lit(5);
-	CLIGetStrWithReturn(6, data, &datalen);
+	bool paramsLoadFromFile = arg_get_lit(4);
+	bool dataMakeFromCDOL = arg_get_lit(5);
+	bool APDULogging = arg_get_lit(6);
+	bool decodeTLV = arg_get_lit(7);
+	CLIGetStrWithReturn(8, data, &datalen);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
@@ -375,22 +513,43 @@ int CmdHFEMVAC(const char *cmd) {
 	
 	// calc CDOL
 	struct tlv *cdol_data_tlv = NULL;
-//	struct tlv *cdol_data_tlv = dol_process(tlvdb_get(tlvRoot, 0x8c, NULL), tlvRoot, 0x01); // 0x01 - dummy tag
 	struct tlv data_tlv = {
 		.tag = 0x01,
 		.len = datalen,
 		.value = (uint8_t *)data,
-	};	
-	cdol_data_tlv = &data_tlv;
-	PrintAndLog("CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+	};
 	
+	if (dataMakeFromCDOL) {
+		ParamLoadDefaults(tlvRoot);
+
+		if (paramsLoadFromFile) {
+			PrintAndLog("Params loading from file...");
+			ParamLoadFromJson(tlvRoot);
+		};
+		
+		cdol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x8c, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
+		if (!cdol_data_tlv){
+			PrintAndLog("ERROR: can't create CDOL TLV.");
+			tlvdb_free(tlvRoot);
+			return 4;
+		}
+	} else {
+		if (paramsLoadFromFile) {
+			PrintAndLog("WARNING: don't need to load parameters. Sending plain CDOL data...");
+		}
+		cdol_data_tlv = &data_tlv;
+	}
+	
+	PrintAndLog("CDOL data[%d]: %s", cdol_data_tlv->len, sprint_hex(cdol_data_tlv->value, cdol_data_tlv->len));
+
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
 	uint16_t sw = 0;
 	int res = EMVAC(leaveSignalON, termDecision, (uint8_t *)cdol_data_tlv->value, cdol_data_tlv->len, buf, sizeof(buf), &len, &sw, tlvRoot);
 	
-//	free(cdol_data_tlv);
+	if (cdol_data_tlv != &data_tlv)
+		free(cdol_data_tlv);
 	tlvdb_free(tlvRoot);
 	
 	if (sw)
@@ -452,28 +611,65 @@ int CmdHFEMVInternalAuthenticate(const char *cmd) {
 	CLIParserInit("hf emv intauth", 
 		"Generate Internal Authenticate command. Usually needs 4-byte random number. It returns data in TLV format .\nNeeds a EMV applet to be selected and GPO to be executed.", 
 		"Usage:\n\thf emv intauth -k 01020304 -> execute Internal Authenticate with 4-byte DDOLdata and keep field ON after command\n"
-			"\thf emv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"); 
+			"\thf emv intauth -t 01020304 -> execute Internal Authenticate with 4-byte DDOL data, show result in TLV\n"
+			"\thf emv intauth -pmt 9F 37 04 -> load params from file, make DDOL data from DDOL, Internal Authenticate with DDOL, show result in TLV"); 
 
 	void* argtable[] = {
 		arg_param_begin,
 		arg_lit0("kK",  "keep",    "keep field ON for next command"),
+		arg_lit0("pP",  "params",  "load parameters from `emv/defparams.json` file for DDOLdata making from DDOL and parameters"),
+		arg_lit0("mM",  "make",    "make DDOLdata from DDOL (tag 9F49) and parameters (by default uses default parameters)"),
 		arg_lit0("aA",  "apdu",    "show APDU reqests and responses"),
 		arg_lit0("tT",  "tlv",     "TLV decode results of selected applets"),
-		arg_strx1(NULL,  NULL,     "<HEX DDOLdata>", NULL),
+		arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
 		arg_param_end
 	};
 	CLIExecWithReturn(cmd, argtable, false);
 	
 	bool leaveSignalON = arg_get_lit(1);
-	bool APDULogging = arg_get_lit(2);
-	bool decodeTLV = arg_get_lit(3);
-	CLIGetStrWithReturn(4, data, &datalen);
+	bool paramsLoadFromFile = arg_get_lit(2);
+	bool dataMakeFromDDOL = arg_get_lit(3);
+	bool APDULogging = arg_get_lit(4);
+	bool decodeTLV = arg_get_lit(5);
+	CLIGetStrWithReturn(6, data, &datalen);
 	CLIParserFree();	
 	
 	SetAPDULogging(APDULogging);
+
+	// Init TLV tree
+	const char *alr = "Root terminal TLV tree";
+	struct tlvdb *tlvRoot = tlvdb_fixed(1, strlen(alr), (const unsigned char *)alr);
 	
-	// DDOL
-	PrintAndLog("DDOL data[%d]: %s", datalen, sprint_hex(data, datalen));
+	// calc DDOL
+	struct tlv *ddol_data_tlv = NULL;
+	struct tlv data_tlv = {
+		.tag = 0x01,
+		.len = datalen,
+		.value = (uint8_t *)data,
+	};
+	
+	if (dataMakeFromDDOL) {
+		ParamLoadDefaults(tlvRoot);
+
+		if (paramsLoadFromFile) {
+			PrintAndLog("Params loading from file...");
+			ParamLoadFromJson(tlvRoot);
+		};
+		
+		ddol_data_tlv = dol_process((const struct tlv *)tlvdb_external(0x9f49, datalen, data), tlvRoot, 0x01); // 0x01 - dummy tag
+		if (!ddol_data_tlv){
+			PrintAndLog("ERROR: can't create DDOL TLV.");
+			tlvdb_free(tlvRoot);
+			return 4;
+		}
+	} else {
+		if (paramsLoadFromFile) {
+			PrintAndLog("WARNING: don't need to load parameters. Sending plain DDOL data...");
+		}
+		ddol_data_tlv = &data_tlv;
+	}
+	
+	PrintAndLog("DDOL data[%d]: %s", ddol_data_tlv->len, sprint_hex(ddol_data_tlv->value, ddol_data_tlv->len));
 	
 	// exec
 	uint8_t buf[APDU_RES_LEN] = {0};
@@ -481,6 +677,10 @@ int CmdHFEMVInternalAuthenticate(const char *cmd) {
 	uint16_t sw = 0;
 	int res = EMVInternalAuthenticate(leaveSignalON, data, datalen, buf, sizeof(buf), &len, &sw, NULL);
 	
+	if (ddol_data_tlv != &data_tlv)
+		free(ddol_data_tlv);
+	tlvdb_free(tlvRoot);	
+	
 	if (sw)
 		PrintAndLog("APDU response status: %04x - %s", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); 
 
@@ -495,136 +695,6 @@ int CmdHFEMVInternalAuthenticate(const char *cmd) {
 
 #define dreturn(n) {free(pdol_data_tlv);tlvdb_free(tlvSelect);tlvdb_free(tlvRoot);DropField();return n;}
 
-bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, size_t maxbufferlen, size_t *bufferlen) {
-	int buflen = 0;	
-	
-	switch(param_gethex_to_eol(hexvalue, 0, buffer, maxbufferlen, &buflen)) {
-	case 1:
-		PrintAndLog("%s Invalid HEX value.", errormsg);
-		return false;
-	case 2:
-		PrintAndLog("%s Hex value too large.", errormsg);
-		return false;
-	case 3:
-		PrintAndLog("%s Hex value must have even number of digits.", errormsg);
-		return false;
-	}
-	
-	if (buflen > maxbufferlen) {
-		PrintAndLog("%s HEX length (%d) more than %d", errormsg, *bufferlen, maxbufferlen);
-		return false;
-	}
-	
-	*bufferlen = buflen;
-	
-	return true;
-}
-
-bool ParamLoadFromJson(struct tlvdb *tlv) {
-	json_t *root;
-	json_error_t error;
-
-	if (!tlv) {
-		PrintAndLog("ERROR load params: tlv tree is NULL.");
-		return false; 
-	}
-
-	// current path + file name
-	const char *relfname = "emv/defparams.json"; 
-	char fname[strlen(get_my_executable_directory()) + strlen(relfname) + 1];
-	strcpy(fname, get_my_executable_directory());
-	strcat(fname, relfname);
-
-	root = json_load_file(fname, 0, &error);
-	if (!root) {
-		PrintAndLog("Load params: json error on line %d: %s", error.line, error.text);
-		return false; 
-	}
-	
-	if (!json_is_array(root)) {
-		PrintAndLog("Load params: Invalid json format. root must be array.");
-		return false; 
-	}
-	
-	PrintAndLog("Load params: json OK");
-	
-	for(int i = 0; i < json_array_size(root); i++) {
-		json_t *data, *jtype, *jlength, *jvalue;
-
-		data = json_array_get(root, i);
-		if(!json_is_object(data))
-		{
-			PrintAndLog("Load params: data [%d] is not an object", i + 1);
-			json_decref(root);
-			return false;
-		}
-		
-		jtype = json_object_get(data, "type");
-		if(!json_is_string(jtype))
-		{
-			PrintAndLog("Load params: data [%d] type is not a string", i + 1);
-			json_decref(root);
-			return false;
-		}
-		const char *tlvType = json_string_value(jtype);
-
-		jvalue = json_object_get(data, "value");
-		if(!json_is_string(jvalue))
-		{
-			PrintAndLog("Load params: data [%d] value is not a string", i + 1);
-			json_decref(root);
-			return false;
-		}
-		const char *tlvValue = json_string_value(jvalue);
-
-		jlength = json_object_get(data, "length");
-		if(!json_is_number(jlength))
-		{
-			PrintAndLog("Load params: data [%d] length is not a number", i + 1);
-			json_decref(root);
-			return false;
-		}
-		
-		int tlvLength = json_integer_value(jlength);
-		if (tlvLength > 250) {
-			PrintAndLog("Load params: data [%d] length more than 250", i + 1);
-			json_decref(root);
-			return false;
-		}
-		
-		PrintAndLog("TLV param: %s[%d]=%s", tlvType, tlvLength, tlvValue);
-		uint8_t buf[251] = {0};
-		size_t buflen = 0;
-		
-		// here max length must be 4, but now tlv_tag_t is 2-byte var. so let it be 2 by now...  TODO: needs refactoring tlv_tag_t...
-		if (!HexToBuffer("TLV Error type:", tlvType, buf, 2, &buflen)) { 
-			json_decref(root);
-			return false;
-		}
-		tlv_tag_t tag = 0;
-		for (int i = 0; i < buflen; i++) {
-			tag = (tag << 8) + buf[i];
-		}	
-		
-		if (!HexToBuffer("TLV Error value:", tlvValue, buf, sizeof(buf) - 1, &buflen)) {
-			json_decref(root);
-			return false;
-		}
-		
-		if (buflen != tlvLength) {
-			PrintAndLog("Load params: data [%d] length of HEX must(%d) be identical to length in TLV param(%d)", i + 1, buflen, tlvLength);
-			json_decref(root);
-			return false;
-		}
-		
-		tlvdb_change_or_add_node(tlv, tag, tlvLength, (const unsigned char *)buf);		
-	}
-
-	json_decref(root);
-
-	return true;
-}
-
 int CmdHFEMVExec(const char *cmd) {
 	uint8_t buf[APDU_RES_LEN] = {0};
 	size_t len = 0;
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index ab0976cc..30e4c8de 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -26,6 +26,10 @@
 #include <string.h>
 #include "proxgui.h"
 #include <QtGui>
+
+extern "C" {
+#include "util_darwin.h"
+}
 //#include <ctime>
 
 bool g_useOverlays = false;
@@ -60,7 +64,12 @@ void ProxGuiQT::_ShowGraphWindow(void)
 		return;
 
 	if (!plotwidget)
+	{
+#if defined(__MACH__) && defined(__APPLE__)
+		makeFocusable();
+#endif
 		plotwidget = new ProxWidget();
+	}
 
 	plotwidget->show();
 }
@@ -108,6 +117,11 @@ void ProxGuiQT::MainLoop()
 	//start proxmark thread after starting event loop
 	QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
 
+#if defined(__MACH__) && defined(__APPLE__)
+	//Prevent the terminal from loosing focus during launch by making the client unfocusable
+	makeUnfocusable();
+#endif
+
 	plotapp->exec();
 }
 
@@ -181,8 +195,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
 	this->master = master;
 	resize(800,500);
 
-	/** Setup the controller widget **/
-
+	// Setup the controller widget
 	controlWidget = new QWidget();
 	opsController = new Ui::Form();
 	opsController->setupUi(controlWidget);
@@ -204,23 +217,17 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
 	QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
 	QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
 
-	controlWidget->show();
-
 	// Set up the plot widget, which does the actual plotting
-
 	plot = new Plot(this);
-	/*
-	QSlider* slider = new QSlider(Qt::Horizontal);
-	slider->setFocusPolicy(Qt::StrongFocus);
-	slider->setTickPosition(QSlider::TicksBothSides);
-	slider->setTickInterval(10);
-	slider->setSingleStep(1);
-	*/
 	QVBoxLayout *layout = new QVBoxLayout;
-	//layout->addWidget(slider);
 	layout->addWidget(plot);
 	setLayout(layout);
-	//printf("Proxwidget Constructor just set layout\r\n");
+	show(); // places the window on the screen.
+
+	// Move controller widget below plot
+	controlWidget->move(x(),y()+frameSize().height());
+	controlWidget->resize(size().width(), controlWidget->size().height());
+	controlWidget->show();
 }
 
 // not 100% sure what i need in this block
diff --git a/client/util_darwin.h b/client/util_darwin.h
new file mode 100644
index 00000000..dd159ec5
--- /dev/null
+++ b/client/util_darwin.h
@@ -0,0 +1,20 @@
+//-----------------------------------------------------------------------------
+// (c) 2018 AntiCat
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// macOS framework bindings
+//-----------------------------------------------------------------------------
+
+#ifndef UTIL_DARWIN_H__
+#define UTIL_DARWIN_H__
+
+void disableAppNap(const char* reason);
+void enableAppNap();
+
+void makeUnfocusable();
+void makeFocusable();
+
+#endif
\ No newline at end of file
diff --git a/client/util_darwin.m b/client/util_darwin.m
new file mode 100644
index 00000000..c0f69aa9
--- /dev/null
+++ b/client/util_darwin.m
@@ -0,0 +1,55 @@
+//-----------------------------------------------------------------------------
+// (c) 2018 AntiCat
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// macOS framework bindings
+//-----------------------------------------------------------------------------
+
+#import "util_darwin.h"
+
+#import <Foundation/NSString.h>
+#import <Foundation/NSProcessInfo.h>
+#import <AppKit/NSApplication.h>
+
+static id activity = nil;
+
+//OS X Version 10.10 is defined in OS X 10.10 and later
+#if defined(MAC_OS_X_VERSION_10_10)
+void disableAppNap(const char* reason) {
+	if(activity == nil) {
+		//NSLog(@"disableAppNap: %@", @(reason));
+		activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityBackground reason:@(reason)];
+		[activity retain];
+	}
+}
+
+void enableAppNap() {
+	if(activity != nil) {
+		//NSLog(@"enableAppNap");
+		[[NSProcessInfo processInfo] endActivity:activity];
+		[activity release];
+		activity = nil;
+	}
+}
+
+#else
+void disableAppNap(const char* reason) { }
+void enableAppNap() { }
+#endif
+
+//OS X Version 10.6 is defined in OS X 10.6 and later
+#if defined(MAC_OS_X_VERSION_10_6)
+void makeUnfocusable() {
+	[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
+}
+
+void makeFocusable() {
+	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+}
+#else
+void makeUnfocusable() { }
+void makeFocusable() { }
+#endif