diff --git a/wifiHD/src/SOFTWARE_FRAMEWORK/BOARDS/ARDUINO/arduino.h b/wifiHD/src/SOFTWARE_FRAMEWORK/BOARDS/ARDUINO/arduino.h
index 4d3f1c354..568548aac 100644
--- a/wifiHD/src/SOFTWARE_FRAMEWORK/BOARDS/ARDUINO/arduino.h
+++ b/wifiHD/src/SOFTWARE_FRAMEWORK/BOARDS/ARDUINO/arduino.h
@@ -92,6 +92,7 @@
 #define LED0_GPIO   AVR32_PIN_PB19
 #define LED1_GPIO   AVR32_PIN_PB20
 #define LED2_GPIO   AVR32_PIN_PB21
+#define DEB_PIN_GPIO AVR32_PIN_PA20
 //! @}
 
 /*! \name PWM Channels of LEDs
diff --git a/wifiHD/src/ard_spi.c b/wifiHD/src/ard_spi.c
index 2920125a2..c86e7ee26 100644
--- a/wifiHD/src/ard_spi.c
+++ b/wifiHD/src/ard_spi.c
@@ -343,7 +343,7 @@ int write_stream(volatile avr32_spi_t *spi, const char *stream, uint16_t len)
 
 void sendError()
 {
-	 AVAIL_FOR_SPI();
+	AVAIL_FOR_SPI();
 	if (spi_write(&AVR32_SPI, ERR_CMD) != SPI_ERROR_TIMEOUT)
 	{
 		//Wait to empty the buffer
@@ -1277,20 +1277,25 @@ unsigned char* getStartCmdSeq(unsigned char* _recv, int len, int *offset)
 {
 	int i = 0;
 	*offset = 0;
+	DEB_PIN_UP();
 	for (; i<len; ++i)
 	{
 		if (_recv[i]==START_CMD)
 		{
 			if (i!=0)
 			{
+				DEB_PIN_DN();
 				//WARN("Disall. %d/%d cmd:%d\n", i, len,_recv[i+1]);
-				//SIGN2_DN();
+				WARN("D=%d\n", i);
+
 			}
 			*offset = i;
 			return &_recv[i];
 		}
 	}
-	WARN("Disall. %d\n", i);
+	DEB_PIN_DN();
+	WARN("D=%d\n", i);
+
 	return NULL;
 }
 
@@ -1442,10 +1447,9 @@ bool checkMsgFormat(uint8_t* _recv, int len, int* offset)
 	unsigned char* recv = getStartCmdSeq(_recv, len, offset);
 	if ((recv == NULL)||(recv!=_recv))
 	{
-		//LED_On(LED2);
-		if (len < 20)	//TODO stamp only short messages wrong
+		if ((verboseDebug & INFO_SPI_FLAG)&&(len < 20))	//TODO stamp only short messages wrong
 			dump((char*)_recv, len);
-		//LED_Off(LED2);
+
 		if (recv == NULL)
 			return false;
 	}
@@ -1498,11 +1502,8 @@ void spi_poll(struct netif* netif) {
 			int err = call_reply_cb(buf, &reply[0]);
 			if (err != REPLY_NO_ERR)
 			{
-				//LED_On(LED1);
-				//INFO_SPI("[E(0x%x):%d spiStatus:%d]\n", statSpi.lastCmd, err, statSpi.status);
 				DUMP_SPI_DATA(buf, count);
 				DUMP_SPI_DATA(reply, replyCount);
-				//LED_Off(LED1);
 			}
 			receivedChars = 0;
 			count = 0;
diff --git a/wifiHD/src/ard_tcp.c b/wifiHD/src/ard_tcp.c
index 72ab1d5f2..70c397c4f 100644
--- a/wifiHD/src/ard_tcp.c
+++ b/wifiHD/src/ard_tcp.c
@@ -34,6 +34,7 @@ static uint8_t tcp_poll_retries = 0;
 static int isDataSentCount = 0;
 
 bool pending_close = false;
+bool pending_accept = false;
 
 static void atcp_init()
 {
@@ -130,7 +131,7 @@ tcp_timeout_cb(void *ctx);
  */
 static void tcp_send_data(struct ttcp *ttcp) {
 	err_t err = ERR_OK;
-	uint32_t len;
+	uint32_t len, orig_len;
 
 	len = ttcp->left;
 	INFO_TCP_VER("left=%d len:%d tcp_sndbuf:%d\n", ttcp->left, len, tcp_sndbuf(ttcp->tpcb));
@@ -145,11 +146,12 @@ static void tcp_send_data(struct ttcp *ttcp) {
 	if (len > tcp_sndbuf(ttcp->tpcb))
 		len = tcp_sndbuf(ttcp->tpcb);
 
+	orig_len = len;
 	uint8_t count = 0;
 	do {
 		startTime = timer_get_ms();
 		err = tcp_write(ttcp->tpcb, ttcp->payload, len, TCP_WRITE_FLAG_COPY);
-		INFO_TCP_VER("%d) tcp_write len:%d err:%d\n", count++, len, err);
+		INFO_TCP("%d) tcp_write %p len:%d err:%d\n", count++, ttcp->tpcb, len, err);
 		if (err == ERR_MEM)
 		{
 			len /= 2;
@@ -167,65 +169,13 @@ static void tcp_send_data(struct ttcp *ttcp) {
 		ttcp->left -= len;
 	}
 	else
-		WARN("TTCP [%p]: tcp_write failed err:%d len:%d\n", ttcp, err, len);
+		WARN("TTCP [%p-%p]: tcp_write failed err:%d origLen:%d len:%d\n",
+				ttcp, ttcp->tpcb, err, orig_len, len);
 	//
 	//        ttcp->tid = timer_sched_timeout_cb(0, TIMEOUT_ONESHOT,
 	//                                           tcp_timeout_cb, ttcp);
 }
 
-/**
- * Only used in TCP mode.
- * Scheduled by tcp_send_data(). tcp_sent() is not used for performance reasons.
- */
-static void tcp_timeout_cb(void *ctx) {
-	struct ttcp *ttcp = ctx;
-
-	if (ttcp->left > 0) {
-		tcp_send_data(ttcp);
-		if (ttcp->verbose) {
-			printk(".");
-			if (ttcp->print_cnt % 80 == 0)
-				printk("\n");
-			ttcp->print_cnt++;
-		}
-		return;
-	}
-
-	/* all sent - empty queue */
-	if (ttcp->tpcb->snd_queuelen)
-		ttcp->tid = timer_sched_timeout_cb(0, TIMEOUT_ONESHOT, tcp_timeout_cb,
-				ttcp);
-	else
-		ard_tcp_done(ttcp, 0);
-}
-
-#if 0
-/**
- * Only used in TCP mode.
- * Called by lwip when there is new space available in the TCP send buffer
- */
-static err_t
-tcp_sent_cb(void *arg, struct tcp_pcb *pcb, u16_t len)
-{
-	struct ttcp *ttcp = arg;
-
-	if (ttcp->left > 0) {
-		tcp_send_data(ttcp);
-		if (ttcp->verbose) {
-			printk(".");
-			if (ttcp->print_cnt % 80 == 0)
-			printk("\n");
-			ttcp->print_cnt++;
-		}
-
-	} else if (pcb->snd_queuelen == 0) {
-		ard_tcp_done(ttcp, 0);
-	}
-
-	return ERR_OK;
-}
-#endif
-
 /**
  * Only used in TCP mode.
  */
@@ -262,14 +212,15 @@ static void cleanSockStateDelayed(void * arg)
  * Only used in TCP mode.
  */
 static void atcp_conn_err_cb(void *arg, err_t err) {
-	struct ttcp* ttcp = arg;
+	struct ttcp* _ttcp = arg;
 
 	WARN("TTCP [%p]: connection error: %d arg:%p\n",
-			ttcp, err, arg);
+			_ttcp, err, arg);
 
 	if (ifStatus == false)
 		printk("Abort connection\n");
-	cleanSockState_cb(ttcp);
+	cleanSockState_cb(_ttcp);
+
 	pending_close = false;
 }
 
@@ -278,9 +229,12 @@ static void close_conn(struct ttcp *_ttcp) {
 	tcp_sent(_ttcp->tpcb, NULL);
 	tcp_recv(_ttcp->tpcb, NULL);
 	err_t err = tcp_close(_ttcp->tpcb);
+	INFO_TCP("Closing tpcb[%p]: state:0x%x err:%d\n",_ttcp->tpcb, _ttcp->tpcb->state, err);
+
 	if (err == ERR_MEM)
 		pending_close = true;
-	INFO_TCP("Closing tpcb[%p]: state:0x%x err:%d\n",_ttcp->tpcb, _ttcp->tpcb->state, err);
+	pending_accept = false;
+	WARN("----------------------\n");
 }
 
 void closeConnections()
@@ -309,14 +263,14 @@ static err_t atcp_recv_cb(void *arg, struct tcp_pcb *pcb, struct pbuf *p,
 		err_t err) {
 	struct ttcp* ttcp = arg;
 
-	INFO_TCP("pcb:%p p: %p err:%d\n", pcb, p, err);
+	INFO_TCP("pcb:%p pbuf: %p err:%d\n", pcb, p, err);
 	if (err == ERR_OK && p != NULL) {
 		DATA_LED_ON();
 		/* for print_stats() */
 		ttcp->recved += p->tot_len;
 
 		if ((ttcp->verbose)||(verboseDebug & INFO_TCP_FLAG)) {
-			INFO_TCP("Recv:%d\n",p->tot_len);
+			INFO_TCP("len:%d\n",p->tot_len);
 			DUMP_TCP(p->payload, p->tot_len);
 			ttcp->print_cnt++;
 		}
@@ -346,10 +300,12 @@ static err_t atcp_poll(void *arg, struct tcp_pcb *pcb) {
 	++tcp_poll_retries;
 
 	if (tcp_poll_retries > 4) {
-		INFO_TCP("ARD TCP [%p] arg=%p retries=%d\n",
+		WARN("ARD TCP [%p] arg=%p retries=%d\n",
 				pcb, arg, tcp_poll_retries);
 		tcp_poll_retries = 0;
 		tcp_abort(pcb);
+		pending_accept = false;
+		pending_close = false;
 	    return ERR_ABRT;
 	}
 
@@ -357,13 +313,17 @@ static err_t atcp_poll(void *arg, struct tcp_pcb *pcb) {
 	{
 		err_t err = tcp_close(pcb);
 		if (err == ERR_MEM)
+		{
 			pending_close = true;
+		}
 		else
+		{
 			pending_close = false;
+		}
 
 		INFO_TCP("ARD TCP [%p-%p] try to close pending:%d\n", pcb, (_ttcp)?_ttcp->tpcb:0, pending_close);
 	}else{
-		INFO_TCP("ARD TCP [%p-%p] arg=%p retries=%d\n", (_ttcp)?_ttcp->tpcb:0, pcb, arg, tcp_poll_retries);
+		WARN("ARD TCP [%p-%p] arg=%p retries=%d\n", (_ttcp)?_ttcp->tpcb:0, pcb, arg, tcp_poll_retries);
 		if (_ttcp) tcp_send_data(_ttcp);
 		else WARN("ttcp NULL!");
 	}
@@ -377,6 +337,15 @@ static err_t atcp_poll(void *arg, struct tcp_pcb *pcb) {
 static err_t atcp_accept_cb(void *arg, struct tcp_pcb *newpcb, err_t err) {
 	struct ttcp* ttcp = arg;
 
+	INFO_TCP("ARD TCP [%p]: accept new [%p]\n", ttcp, newpcb);
+	INFO_TCP("local:%d remote:%d state:%d\n", newpcb->local_port, newpcb->remote_port, newpcb->state);
+
+	if (pending_accept)
+	{
+		WARN("Accepting another connection: %p-%p\n", ttcp->tpcb, newpcb);
+		return ERR_OK;
+	}
+	pending_accept = true;
     tcp_setprio(newpcb, TCP_PRIO_MIN);
     tcp_poll_retries = 0;
 	ttcp->tpcb = newpcb;
@@ -384,8 +353,6 @@ static err_t atcp_accept_cb(void *arg, struct tcp_pcb *newpcb, err_t err) {
 	tcp_err(ttcp->tpcb, atcp_conn_err_cb);
 	tcp_poll(ttcp->tpcb, atcp_poll, 4);
 
-	INFO_TCP("ARD TCP [%p]: accept new [%p]\n", ttcp, newpcb);
-	INFO_TCP("local:%d remote:%d state:%d\n", newpcb->local_port, newpcb->remote_port, newpcb->state);
 	ttcp->start_time = timer_get_ms();
 	return ERR_OK;
 }
diff --git a/wifiHD/src/ard_utils.h b/wifiHD/src/ard_utils.h
index 8f4e8aeea..c3d1642b1 100644
--- a/wifiHD/src/ard_utils.h
+++ b/wifiHD/src/ard_utils.h
@@ -11,7 +11,7 @@
 #include "gpio.h"
 #include "debug.h"
 #include "ARDUINO/arduino.h"
-#define INIT_SIGNAL_FOR_SPI() 	gpio_enable_pin_pull_up(ARDUINO_HANDSHAKE_PIN)
+#define INIT_SIGNAL_FOR_SPI() 	gpio_disable_pin_pull_up(ARDUINO_HANDSHAKE_PIN);
 #define BUSY_FOR_SPI() 			gpio_set_gpio_pin(ARDUINO_HANDSHAKE_PIN)
 #define AVAIL_FOR_SPI() 		gpio_clr_gpio_pin(ARDUINO_HANDSHAKE_PIN)
 
@@ -25,6 +25,7 @@
 #define LED2_DN() 				gpio_clr_gpio_pin(LED2_GPIO)
 #define LED2_TL() 				gpio_tgl_gpio_pin(LED2_GPIO)
 
+
 #ifdef _DEBUG_
 #define SIGN0_UP		LED0_UP
 #define SIGN0_DN 		LED0_DN
@@ -36,6 +37,10 @@
 #define SIGN2_DN 		LED2_DN
 #define SIGN2_TL 		LED2_TL
 
+#define DEB_PIN_UP() 			gpio_set_gpio_pin(DEB_PIN_GPIO)
+#define DEB_PIN_DN() 			gpio_clr_gpio_pin(DEB_PIN_GPIO)
+#define DEB_PIN_ENA() 			gpio_enable_gpio_pin(DEB_PIN_GPIO);
+
 #else
 #define SIGN0_UP()
 #define SIGN0_DN()
@@ -46,6 +51,10 @@
 #define SIGN2_UP()
 #define SIGN2_DN()
 #define SIGN2_TL()
+
+#define DEB_PIN_UP()
+#define DEB_PIN_DN()
+
 //#define TOGGLE_SIG0
 #endif
 
diff --git a/wifiHD/src/board_init.c b/wifiHD/src/board_init.c
index 5e5d7e98b..a2a191ea9 100644
--- a/wifiHD/src/board_init.c
+++ b/wifiHD/src/board_init.c
@@ -282,16 +282,16 @@ static void init_printk(void)
 void board_init(void)
 {
         
-        init_exceptions();
-	init_hmatrix();
-	init_sys_clocks();
-	init_interrupts();
+    init_exceptions();
+    init_hmatrix();
+    init_sys_clocks();
+    init_interrupts();
 
-        init_rs232();
-        init_printk();
+    init_rs232();
+    init_printk();
         
 #ifdef WITH_SDRAM
-        sdramc_init(FHSB_HZ);
+    sdramc_init(FHSB_HZ);
 #endif
-        init_spi();
+    init_spi();
 }
diff --git a/wifiHD/src/main.c b/wifiHD/src/main.c
index f0fe63a4f..cf41bf779 100644
--- a/wifiHD/src/main.c
+++ b/wifiHD/src/main.c
@@ -155,13 +155,14 @@ wl_cm_disconn_cb(void* ctx)
      set_result_cmd(WL_FAILURE);
 }
 
-
+#if 0
 static void wl_cm_err_cb(void* ctx)
 {
     int err = *(int*)ctx;
     WARN("Error: %d\n", err);
     set_result_cmd(err);
 }
+#endif
 
 /**
  *
@@ -194,9 +195,6 @@ led_init(void)
 	LINK_LED_OFF();
 	ERROR_LED_OFF();
 	DATA_LED_OFF();
-
-    //LED_Off(LED1);
-    //LED_Off(LED2);
 }
 
 
@@ -354,6 +352,10 @@ void startup_init(void)
 {
 	INIT_SIGNAL_FOR_SPI();
 	BUSY_FOR_SPI();
+
+	// if DEBUG enabled use DEB_PIN_GPIO for debug purposes
+    DEB_PIN_ENA();
+    DEB_PIN_UP();
 }
 
 /**