diff --git a/android/jni/main.cpp b/android/jni/main.cpp
index 84ae351..bf757a4 100644
--- a/android/jni/main.cpp
+++ b/android/jni/main.cpp
@@ -27,6 +27,9 @@
  */
 
  #include "globals.h"
+ #include <stdio.h>
+ #include <string.h>
+ #include <lib3270/config.h>
  #include <lib3270/popup.h>
  #include <lib3270/internals.h>
 
@@ -126,22 +129,24 @@ static int write_buffer(H3270 *session, unsigned const char *buf, int len)
 	return rc;
 }
 
-static void * add_timeout(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
+static void * add_timer(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
 {
+	TIMER * timer = NULL;
+
 	if(session->widget)
 	{
 		JNIEnv		* env			= ((INFO *) session->widget)->env;
 		jobject		  obj 			= ((INFO *) session->widget)->obj;
 		jclass 		  cls 			= env->GetObjectClass(obj);
 		jmethodID	  mid			= env->GetMethodID(cls, "newTimer", "(JI)V");
-		TIMER		* timer 		= (TIMER *) lib3270_malloc(sizeof(TIMER));
 
+		timer			= (TIMER *) lib3270_malloc(sizeof(TIMER));
 		timer->sz		= sizeof(timer);
 		timer->enabled	= true;
 		timer->session  = session;
 		timer->proc		= proc;
 
-		__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Timer ID %08lx created",(unsigned long) timer);
+		trace("Timer %08lx created",(unsigned long) timer);
 
 		env->CallVoidMethod(obj,mid, (jlong) timer, (jint) interval_ms);
 
@@ -151,19 +156,22 @@ static void * add_timeout(unsigned long interval_ms, H3270 *session, void (*proc
 		__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Can set timer, no jni env for active session");
 	}
 
-
+	return timer;
 }
 
-static void remove_timeout(void *timer)
+static void remove_timer(void *id)
 {
-	if(timer == NULL || ((TIMER *) timer)->sz != sizeof(TIMER))
+	TIMER *timer = (TIMER *) id;
+
+	if(timer == NULL)
 	{
 		__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Invalid timer ID %08lx",(unsigned long) timer);
 		return;
 	}
 
-	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Removing timeout %d",(int) timer);
-	((TIMER *) timer)->enabled = false;
+	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Disabling timer %08lx",(unsigned long) timer);
+
+	timer->enabled = false;
 
 }
 
@@ -177,30 +185,71 @@ JNIEXPORT void JNICALL Java_br_com_bb_pw3270_lib3270_timerFinish(JNIEnv *env, jo
 		return;
 	}
 
-	if(timer->sz != sizeof(TIMER))
-	{
-		__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME,
-							"Invalid timer ID %08lx in %s (sz=%d, expected=%d)",(unsigned long) timer,
-							__FUNCTION__,timer->sz,sizeof(timer));
-		return;
-	}
-
 	if(timer->enabled)
+	{
+		__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Running timer %08lx",(unsigned long) timer);
 		timer->proc(timer->session);
+	}
 
 	lib3270_free(timer);
 }
 
+#ifdef X3270_TRACE
+static void tracehandler(H3270 *session, const char *fmt, va_list args)
+{
+	static char		* buffer 	= NULL;
+	static int		  szBuffer	= 0;
 
+	char		  	  temp[4096];
+	size_t			  sz;
+	char			* src;
+	char			* dst;
+
+	if(!szBuffer)
+	{
+		buffer = (char *) lib3270_malloc(szBuffer = 4096);
+		*buffer = 0;
+	}
+
+	sz = vsnprintf(temp,4095,fmt,args);
+
+	if( (sz+strlen(buffer)) > szBuffer)
+	{
+		szBuffer += (sz+strlen(buffer)+1);
+		buffer = (char *) lib3270_realloc(buffer,szBuffer);
+	}
+
+	dst = buffer+strlen(buffer);
+	for(src = temp;*src;src++)
+	{
+		if(*src == '\n')
+		{
+			*dst = 0;
+			__android_log_print(ANDROID_LOG_DEBUG, PACKAGE_NAME, "%s", buffer);
+			dst = buffer;
+		}
+		else
+		{
+			*(dst++) = *src;
+		}
+	}
+
+	*dst = 0;
+}
+#endif // X3270_TRACE
 
 JNIEXPORT jint JNICALL Java_br_com_bb_pw3270_lib3270_init(JNIEnv *env, jclass obj)
 {
 	H3270	* session	= lib3270_session_new("");
 
-	__android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "Initializing session %p",session);
+	__android_log_print(ANDROID_LOG_DEBUG, PACKAGE_NAME, "Initializing session %p",session);
+
+#ifdef X3270_TRACE
+	lib3270_set_trace_handler(tracehandler);
+#endif // X3270_TRACE
 
 	lib3270_set_popup_handler(popuphandler);
-	lib3270_register_time_handlers(add_timeout,remove_timeout);
+	lib3270_register_time_handlers(add_timer,remove_timer);
 
 	session->write			= write_buffer;
 	session->changed 		= changed;
@@ -264,6 +313,8 @@ JNIEXPORT void JNICALL Java_br_com_bb_pw3270_lib3270_procRecvdata(JNIEnv *env, j
 
 	lib3270_data_recv(session, (size_t) sz, netrbuf);
 
+	trace("Liberando %d bytes",(size_t) sz);
+
 	env->ReleaseByteArrayElements(buffer, (signed char *) netrbuf, 0);
 
 	session_release();
diff --git a/android/lib3270NDK.cbp b/android/lib3270NDK.cbp
index 22e7a4e..1c42ddc 100644
--- a/android/lib3270NDK.cbp
+++ b/android/lib3270NDK.cbp
@@ -36,6 +36,7 @@
 		<Unit filename="../src/include/lib3270/actions.h" />
 		<Unit filename="../src/include/lib3270/html.h" />
 		<Unit filename="../src/include/lib3270/internals.h" />
+		<Unit filename="../src/include/lib3270/log.h" />
 		<Unit filename="../src/include/lib3270/session.h" />
 		<Unit filename="../src/lib3270/html.c">
 			<Option compilerVar="CC" />
@@ -50,6 +51,9 @@
 		<Unit filename="../src/lib3270/telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../src/lib3270/trace_ds.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="Makefile" />
 		<Unit filename="jni/Android.mk" />
 		<Unit filename="jni/actions.cpp" />
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
deleted file mode 100644
index c3ee337..0000000
--- a/android/res/layout/main.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <EditText
-            android:id="@+id/hostname"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:ems="10" />
-
-        <Button
-            android:id="@+id/connect"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:text="@string/connect" />
-
-    </LinearLayout>
-    
-    <WebView
-        android:id="@+id/view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/src/br/com/bb/pw3270/PW3270Activity.java b/android/src/br/com/bb/pw3270/PW3270Activity.java
index ccefb69..1167558 100644
--- a/android/src/br/com/bb/pw3270/PW3270Activity.java
+++ b/android/src/br/com/bb/pw3270/PW3270Activity.java
@@ -13,7 +13,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebChromeClient;
-import java.io.InputStream;
+// import java.io.InputStream;
 
 // import android.app.Dialog;
 
diff --git a/android/src/br/com/bb/pw3270/lib3270.java b/android/src/br/com/bb/pw3270/lib3270.java
index 2aa2f89..24292cc 100644
--- a/android/src/br/com/bb/pw3270/lib3270.java
+++ b/android/src/br/com/bb/pw3270/lib3270.java
@@ -10,7 +10,7 @@ import java.net.Socket;
 import javax.net.ssl.SSLSocketFactory;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.util.Vector;
+// import java.util.Vector;
 
 public class lib3270
 {
diff --git a/src/include/lib3270/config.h.in b/src/include/lib3270/config.h.in
index 7eb5d5a..cbbced9 100644
--- a/src/include/lib3270/config.h.in
+++ b/src/include/lib3270/config.h.in
@@ -54,10 +54,11 @@
 
 #ifndef ANDROID
 	#undef HAVE_LIBSSL
-	#define X3270_TRACE
 	#define X3270_FT
 #endif // ANDROID
 
+	#define X3270_TRACE
+
 	/* #define X3270_PRINTER */
 
 	#undef HAVE_IGEMAC
diff --git a/src/lib3270/iocalls.c b/src/lib3270/iocalls.c
index 18c590d..bb94677 100644
--- a/src/lib3270/iocalls.c
+++ b/src/lib3270/iocalls.c
@@ -533,12 +533,16 @@ static void internal_ring_bell(H3270 *session)
 
 void * AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
 {
+	void *timer;
 	CHECK_SESSION_HANDLE(session);
-	return add_timeout(interval_ms,session,proc);
+	timer = add_timeout(interval_ms,session,proc);
+	trace("Timeout %p created with %ld ms",timer,interval_ms);
+	return timer;
 }
 
 void RemoveTimeOut(void * timer)
 {
+	trace("Removing timeout %p",timer);
 	return remove_timeout(timer);
 }
 
diff --git a/src/lib3270/sources.mak b/src/lib3270/sources.mak
index d401163..0e4c83f 100644
--- a/src/lib3270/sources.mak
+++ b/src/lib3270/sources.mak
@@ -27,12 +27,12 @@
 # Terminal only sources
 TERMINAL_SOURCES =	bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
 					host.c sf.c ansi.c resolver.c tables.c utf8.c charset.c \
-					version.c session.c state.c html.c
+					version.c session.c state.c html.c trace_ds.c see.c
 
 # Network I/O Sources
 NETWORK_SOURCES = iocalls.c proxy.c
 
 # Full library sources
 SOURCES =			$(TERMINAL_SOURCES) $(NETWORK_SOURCES) ft.c ft_cut.c ft_dft.c glue.c resources.c \
-					rpq.c see.c trace_ds.c paste.c macros.c fallbacks.c log.c
+					rpq.c paste.c macros.c fallbacks.c log.c
 
--
libgit2 0.21.2