diff --git a/Makefile.am b/Makefile.am
index a2c6f1c5..1bc66edd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,18 +62,12 @@ EXTRA_DIST =																		\
 deb:
 	fakeroot dpkg-buildpackage
 
-install-exec-hook:																	\
-	(mkdir -p $(pkgdatadir) &&												\
-	 mkdir -p $(pkgdatadir)/plugins &&								\
-	 mkdir -p $(pkgdatadir)/ide &&										\
-	 mkdir -p $(pkgdatadir)/samples &&								\
-	 cp documentation/sbasic_ref.csv $(pkgdatadir) &&	\
-	 cp plugins/*.* $(pkgdatadir)/plugins &&					\
-	 cp ide/*.* $(pkgdatadir)/ide)
-
 test:
 	(cd $(SUBDIRS) && make test)
 
+release:
+	(cd $(SUBDIRS) && make release)
+
 # produce a stack dump
 ndk-stack:
 	adb logcat | ${NDK}/ndk-stack -sym src/platform/android/obj/local/armeabi
diff --git a/README b/README
index 54ca1c21..b1e3c93d 100644
--- a/README
+++ b/README
@@ -30,13 +30,13 @@ Then use it to cross-compile the tools:
   make
   make install DESTDIR=$(pwd)
 
-3. Build common
+3. setup config.h
 
-./configure --enable-android --host=arm-linux-androideabi
+./configure --enable-android
 
 4. Build the native activity
 
-$ cd src/platform/andoid/jni && $NDK/ndk-build
+$ cd src/platform/andoid/jni && $NDK/ndk-build NDK_DEBUG=0
 
 $ cd - && cd ide/android/ && ant release install
 
diff --git a/configure.ac b/configure.ac
index 7f0fdf91..054fe9f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.11.8])
+AC_INIT([smallbasic], [0.11.11])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -123,14 +123,6 @@ function checkPCRE() {
    fi
 }
 
-function checkSearch() {
-   have_saerch="maybe"
-   AC_CHECK_HEADER(search.h, [have_search="yes"], [have_search="no"])
-   if test x$have_search = xyes ; then
-      AC_DEFINE(HAVE_SEARCH_H, 1, [Found GNU search.h])
-   fi
-}
-
 function defaultConditionals() {
    AM_CONDITIONAL(WITH_HILDON, false)
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
@@ -511,7 +503,7 @@ function buildTizen() {
 }
 
 function buildAndroid() {
-   TARGET="Building common library for Android."
+   TARGET="Building for Android."
 
    defaultConditionals
 
@@ -528,7 +520,7 @@ function buildAndroid() {
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
 
-   BUILD_SUBDIRS="src/platform/android/common"
+   BUILD_SUBDIRS="src/platform/android"
    AC_SUBST(BUILD_SUBDIRS)
 }
 
@@ -633,7 +625,6 @@ else
    buildConsole
 fi  
 
-checkSearch
 checkPCRE
 checkDebugMode
 checkForWindows
@@ -654,7 +645,7 @@ src/platform/mingw/Makefile
 src/platform/unix/Makefile
 src/platform/mosync/common/Makefile
 src/platform/tizen/common/Makefile
-src/platform/android/common/Makefile
+src/platform/android/Makefile
 ])
 AC_OUTPUT
 
diff --git a/debian/changelog b/debian/changelog
index aa9711b2..8bf8438b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
+smallbasic (0.11.11) unstable; urgency=low
+  * Built using common code from the android project and SDL
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 19 July 2014 09:45:25 +1000
+
+smallbasic (0.11.10) unstable; urgency=low
+  * Built using common code from the android project and SDL
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 19 July 2014 09:45:25 +1000
+
 smallbasic (0.10.8) unstable; urgency=low
   * Fix misc issues with const char* uncovered with new gcc
 
  -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 31 July 2010 09:45:25 +1000
-  
+
 smallbasic (0.10.7) unstable; urgency=low
   * Added defineKey and fixed delay problems with the inkey command
 
diff --git a/debian/control b/debian/control
index 390f23b3..c269e16d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,6 @@ Description: One more basic
  SmallBASIC is a fast and easy to learn BASIC language interpreter 
  ideal for everyday calculations, scripts and prototypes. 
  SmallBASIC includes trigonometric, matrices and algebra functions, 
- a built in IDE, a powerful string library, system, sound, and graphic
+ a powerful string library, system, sound, and graphic
  commands along with structured programming syntax. 
  SmallBASIC is licensed under the GPL. 
diff --git a/debian/rules b/debian/rules
index 185d5123..afded1fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs 
 	dh_installexamples 
-	dh_install --exclude=".svn" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
+	dh_install --exclude=".git" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
 	dh_installman
 	dh_link
 	dh_strip
diff --git a/ide/android/AndroidManifest.xml b/ide/android/AndroidManifest.xml
index f7ca3f9b..2ecb8261 100644
--- a/ide/android/AndroidManifest.xml
+++ b/ide/android/AndroidManifest.xml
@@ -2,12 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
-          android:versionCode="10"
-          android:versionName="0.11.8">
+          android:versionCode="13"
+          android:versionName="0.11.11">
   <!-- This is the platform API where NativeActivity was introduced. -->
-  <uses-sdk android:minSdkVersion="9" />
+  <uses-sdk android:minSdkVersion="9"/>
 
-  <!-- This .apk has no Java code itself, so set hasCode to false. -->
+  <!-- support large + xlarge screens to avoid compatibility mode -->
+  <supports-screens android:largeScreens="true" />
+  <supports-screens android:xlargeScreens="true" />
+
+  <!-- This .apk has Java code, so set hasCode to true. -->
   <application android:label="@string/app_name"
                android:hasCode="true"
                android:hardwareAccelerated="true"
@@ -55,7 +59,9 @@
     </activity>
   </application>
   <!-- Permissions -->
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
 
diff --git a/ide/android/assets/main.bas b/ide/android/assets/main.bas
index 4a6693c9..952787a7 100644
--- a/ide/android/assets/main.bas
+++ b/ide/android/assets/main.bas
@@ -30,7 +30,7 @@ sub about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.11.8"
+  print "Version 0.11.11"
   print
   print "Copyright (c) 2002-2014 Chris Warren-Smith"
   print "Copyright (c) 2000-2006 Nic Christopoulos" + chr(10)
diff --git a/ide/android/build.xml b/ide/android/build.xml
index e417ae1e..4c2085ca 100644
--- a/ide/android/build.xml
+++ b/ide/android/build.xml
@@ -2,10 +2,10 @@
 <project name="SmallBASIC" default="help">
 
   <!-- Build requires the following setup:
-       ln -s jni -> ../../src/platform/android/jni
-       ln -s libs -> ../../src/platform/android/libs/
-       ln -s obj -> ../../src/platform/android/obj/
-       src -> ../../src/platform/android/src/
+       ln -s ../../src/platform/android/jni jni
+       ln -s ../../src/platform/android/libs libs
+       ln -s ../../src/platform/android/obj obj
+       ln -s ../../src/platform/android/src src
   -->
   
   <!-- The local.properties file is created and updated by the 'android' tool.
diff --git a/samples/distro-examples/examples/meminfo.bas b/samples/distro-examples/examples/meminfo.bas
new file mode 100644
index 00000000..f9786409
--- /dev/null
+++ b/samples/distro-examples/examples/meminfo.bas
@@ -0,0 +1,42 @@
+? "MemTotal: "; fre(0)
+? "MemFree: "; fre(1)
+? "Buffers: "; fre(2)
+? "Cached: "; fre(3)
+? "SwapCached: "; fre(4)
+? "Active: "; fre(5)
+? "Inactive: "; fre(6)
+? "Active(anon): "; fre(7)
+? "Inactive(anon): "; fre(8)
+? "Active(file): "; fre(9)
+? "Inactive(file): "; fre(10)
+? "Unevictable: "; fre(11)
+? "Mlocked: "; fre(12)
+? "SwapTotal: "; fre(13)
+? "SwapFree: "; fre(14)
+? "Dirty: "; fre(15)
+? "Writeback: "; fre(16)
+? "AnonPages: "; fre(17)
+? "Mapped: "; fre(18)
+? "Shmem: "; fre(19)
+? "Slab: "; fre(20)
+? "SReclaimable: "; fre(21)
+? "SUnreclaim: "; fre(22)
+? "KernelStack: "; fre(23)
+? "PageTables: "; fre(24)
+? "NFS_Unstable: "; fre(25)
+? "Bounce: "; fre(26)
+? "WritebackTmp: "; fre(27)
+? "CommitLimit: "; fre(28)
+? "Committed_AS: "; fre(29)
+? "VmallocTotal: "; fre(30)
+? "VmallocUsed: "; fre(31)
+? "VmallocChunk: "; fre(32)
+? "HardwareCorrupted: "; fre(33)
+? "AnonHugePages: "; fre(34)
+? "HugePages_Total: "; fre(35)
+? "HugePages_Free: "; fre(36)
+? "HugePages_Rsvd: "; fre(37)
+? "HugePages_Surp: "; fre(38)
+? "Hugepagesize: "; fre(39)
+? "DirectMap4k: "; fre(40)
+? "DirectMap2M: "; fre(41)
diff --git a/samples/distro-examples/tests/hash.bas b/samples/distro-examples/tests/hash.bas
new file mode 100644
index 00000000..4b4ec0b0
--- /dev/null
+++ b/samples/distro-examples/tests/hash.bas
@@ -0,0 +1,10 @@
+dim foo
+
+key="blah"
+foo(key) = "something"
+foo("other") = 123
+
+? foo(key)
+? foo("other")
+? foo
+
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ec9a44be..5aa940ee 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -77,6 +77,7 @@ libsb_common_a_SOURCES =												\
     scan.c scan.h																\
     str.c str.h																	\
     tasks.c tasks.h															\
+    search.c search.h 													\
     var_uds.c var_uds.h													\
     var_hash.c var_hash.h												\
     keymap.c keymap.h														\
diff --git a/src/common/blib_func.c b/src/common/blib_func.c
index 3baf8349..08fac3c4 100644
--- a/src/common/blib_func.c
+++ b/src/common/blib_func.c
@@ -621,14 +621,94 @@ var_num_t cmd_math1(long funcCode, var_t *arg) {
   return r;
 }
 
+//
+// QB-standard:
+// int <- FRE(0) // free memory
+// int <- FRE(-1) // largest block of integers
+// int <- FRE(-2) // free stack
+// int <- FRE(-3) // largest free block
+//
+// Our standard (it is optional for now):
+// int <- FRE(-10) // total ram
+// int <- FRE(-11) // used
+// int <- FRE(-12) // free
+//
+// Optional-set #1: memory related info (-1x)
+// int <- FRE(-13) // shared
+// int <- FRE(-14) // buffers
+// int <- FRE(-15) // cached
+// int <- FRE(-16) // total virtual memory size
+// int <- FRE(-17) // used virtual memory
+// int <- FRE(-18) // free virtual memory
+//
+// Optional-set #2: system related info (-2x)
+//
+// Optional-set #3: file-system related info (-3x)
+//
+// Optional-set #4: battery related info (-4x)
+// int <- FRE(-40) // battery voltage * 1000
+// int <- FRE(-41) // battery percent
+// int <- FRE(-42) // battery critical voltage value * 1000
+// int <- FRE(-43) // battery warning voltage value * 1000
+//
+var_int_t cmd_fre(var_int_t arg) {
+  var_int_t r = 0;
+#if defined(_UnixOS)
+  // assumes first two items are total + free
+  #define I_MEM_TOTAL 0
+  #define I_MEM_FREE  1
+  int memfd = open("/proc/meminfo", O_RDONLY);
+  if (memfd) {
+    int i_val = 0;
+    var_int_t total = 0;
+    ssize_t n;
+    char ch;
+
+    for (n = read(memfd, &ch, sizeof(ch));
+         r == 0 && n != 0; n = read(memfd, &ch, sizeof(ch))) {
+      if (ch == ':') {
+        // skip leading white space
+        n = read(memfd, &ch, sizeof(ch));
+        while (n != 0 && ch == ' ') {
+          n = read(memfd, &ch, sizeof(ch));
+        }
+        
+        // read the value
+        long long val = 0;
+        while (n != 0 && isdigit(ch)) {
+          val = (val * 10) + (ch - '0');
+          n = read(memfd, &ch, sizeof(ch));
+        }
+
+        if (arg == i_val
+            || (arg == -10 && i_val == I_MEM_TOTAL)
+            || (arg == -12 && i_val == I_MEM_FREE)) {
+          r = val * 1024 / 1000;
+        }
+        if (i_val == I_MEM_TOTAL) {
+          total = val;
+        }
+        else if (i_val == I_MEM_FREE && arg == -11) {
+          // return used memory
+          r = (total - val) * 1024 / 1000;
+        }
+        i_val++;
+      }
+    }
+    close(memfd);
+  }
+#endif
+  return r;
+}
+
 /*
  * i <- FUNC (f|i)
  */
 var_int_t cmd_imath1(long funcCode, var_t *arg) {
-  var_int_t r = 0, x;
+  var_int_t r = 0;
 
   IF_ERR_RETURN;
-  x = v_getint(arg);
+  var_int_t x = v_getint(arg);
 
   switch (funcCode) {
   case kwTIMER:
@@ -724,161 +804,11 @@ var_int_t cmd_imath1(long funcCode, var_t *arg) {
     break;
   case kwFRE:
     //
-    // QB-standard:
-    // int <- FRE(0) // free memory
-    // int <- FRE(-1) // largest block of integers
-    // int <- FRE(-2) // free stack
-    // int <- FRE(-3) // largest free block
-    //
-    // Our standard (it is optional for now):
-    // int <- FRE(-10) // total ram
-    // int <- FRE(-11) // used
-    // int <- FRE(-12) // free
-    //
-    // Optional-set #1: memory related info (-1x)
-    // int <- FRE(-13) // shared
-    // int <- FRE(-14) // buffers
-    // int <- FRE(-15) // cached
-    // int <- FRE(-16) // total virtual memory size
-    // int <- FRE(-17) // used virtual memory
-    // int <- FRE(-18) // free virtual memory
+    // int <- FRE(n)
     //
-    // Optional-set #2: system related info (-2x)
-    //
-    // Optional-set #3: file-system related info (-3x)
-    //
-    // Optional-set #4: battery related info (-4x)
-    // int <- FRE(-40) // battery voltage * 1000
-    // int <- FRE(-41) // battery percent
-    // int <- FRE(-42) // battery critical voltage value * 1000
-    // int <- FRE(-43) // battery warning voltage value * 1000
-    //
-  {
-#if defined(_UnixOS)
-    int memfd;
-
-    memfd = open("/proc/meminfo", O_RDONLY);
-    r = 0;
-    if (memfd) {
-      char tmp[1024];
-      char *p, *ps;
-      // total, used, free, shared, buffs, cached;
-      long long vals[6];
-      int i;
-
-      read(memfd, tmp, 1024);
-      if ((p = strstr(tmp, "Mem: ")) != NULL) {
-        p += 4;
-
-        for (i = 0; i < 6; i++) {
-          // word
-          while (*p == ' ' || *p == '\t')
-          p++;
-          ps = p;
-          while (is_digit(*p))
-          p++;
-          *p = '\0';
-          p++;
-
-#if defined(__CYGWIN__)
-          vals[i] = atol(ps);
-#else
-          vals[i] = atoll(ps);
-#endif
-        }
-
-        switch (x) {
-          case 0:
-          r = (vals[2] + vals[4] + vals[5]);
-          break;
-          case -1:
-          r = (vals[2] + vals[4] + vals[5]) / 4;
-          break;
-          case -2:
-          r = (vals[2] + vals[4] + vals[5]);
-          break;
-          case -3:
-          r = (vals[2] + vals[4] + vals[5]);
-          break;
-          default:
-          if ((x <= -10) && (x >= -15))
-          r = vals[(-x) - 10];
-          else
-          r = 0;
-        };
-      }
-      close(memfd);
-    }
-#elif defined (_FRANKLIN_EBM)
-    switch (x) {
-      case 0:
-      case -3:
-      case -12:
-      r = Sigma_GetAvailableMem();
-      break;
-      case -1:
-      r = Sigma_GetAvailableMem() / 4L;
-      break;
-      case -10:
-      r = Sigma_GetPhysicalMemSize();
-      break;
-      case -11:
-      r = Sigma_GetPhysicalMemSize() - Sigma_GetAvailableMem();
-      break;
-      case -40:
-      r = BAT_GetVoltage() * 10;
-      break;
-      case -41:
-      r = BAT_GetPercent();
-      break;
-      default:
-      r = 0;
-    }
-#elif defined(_DOS)
-    switch (x) {
-      case 0:                  // free mem
-      case -12:
-      r = _go32_dpmi_remaining_physical_memory();
-      break;
-      case -1: {
-        __dpmi_free_mem_info mi;
-        _go32_dpmi_get_free_memory_information(&mi);
-        r = mi.largest_available_free_block_in_bytes / 4L;
-      }
-      break;
-      case -2:                 // stk
-      r = stackavail();
-      break;
-      case -3: {
-        __dpmi_free_mem_info mi;
-        _go32_dpmi_get_free_memory_information(&mi);
-        r = mi.largest_available_free_block_in_bytes;
-      }
-      break;
-    }
-#elif defined(_WinBCB)
-    MEMORYSTATUS ms;
-    ms.dwLength = sizeof(MEMORYSTATUS);
-    GlobalMemoryStatus(&ms);
-
-    switch (x) {
-      case 0:                  // free mem
-      case -3:// largest block
-      case -12:// free mem
-      r = ms.dwAvailPhys;
-      break;
-      case -1:// int
-      r = ms.dwAvailPhys / 4L;
-      break;
-      case -2:// stk
-      r = 0x120000;
-      break;
-    }
-#else
-    r = 0;
-#endif
-  }
+    r = cmd_fre(x);
     break;
+
   default:
     rt_raise("Unsupported built-in function call %ld, please report this bug (3)", funcCode);
   };
@@ -887,7 +817,7 @@ var_int_t cmd_imath1(long funcCode, var_t *arg) {
 }
 
 //
-//      i|f <- FUNC (str)
+// i|f <- FUNC (str)
 //
 void cmd_ns1(long funcCode, var_t * arg, var_t * r) {
   IF_ERR_RETURN;
diff --git a/src/common/search.c b/src/common/search.c
new file mode 100644
index 00000000..455e4902
--- /dev/null
+++ b/src/common/search.c
@@ -0,0 +1,99 @@
+// This file is part of SmallBASIC
+//
+// Tree search generalized from Knuth (6.2.2) Algorithm T just like
+// the AT&T man page says.
+//
+// The node_t structure is for internal use only, lint doesn't grok it.
+//
+// Written by reading the System V Interface Definition, not the code.
+//
+// Totally public domain.
+//
+
+#include <sys/cdefs.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#include "search.h"
+
+typedef struct node {
+  void *key;
+  struct node *left, *right;
+} node_t;
+
+/* Walk the nodes of a tree */
+tdestroy_recurse(node_t *root, tdestroy_cb freefct) {
+  if (root->left != NULL) {
+    tdestroy_recurse(root->left, freefct);
+  }
+  if (root->right != NULL) {
+    tdestroy_recurse(root->right, freefct);
+  }
+  (*freefct) ((void *) root->key);
+  free(root);
+}
+
+/* Walk the nodes of a tree */
+void trecurse(const node_t *root, twalk_cb action, int level) {
+  if (root->left == NULL && root->right == NULL) {
+    action(root, leaf, level);
+  } else {
+    action(root, preorder, level);
+    if (root->left != NULL) {
+      trecurse(root->left, action, level + 1);
+    }
+    action(root, postorder, level);
+    if (root->right != NULL) {
+      trecurse(root->right, action, level + 1);
+    }
+    action(root, endorder, level);
+  }
+}
+
+/* find a node, or return 0 */
+void *tfind(const void *vkey, void **vrootp, tcompare_cb compar) {
+  node_t **rootp = (node_t **)vrootp;
+
+  while (rootp != NULL && *rootp != NULL) {
+    int r = (*compar)(vkey, (*rootp)->key);
+    if (r == 0) {
+      // found
+      return *rootp;
+    }
+    rootp = (r < 0) ? &(*rootp)->left : &(*rootp)->right;
+  }
+  return NULL;
+}
+
+/* find or insert datum into search tree */
+void *tsearch(const void *vkey, void **vrootp, tcompare_cb compar) {
+  node_t **rootp = (node_t **) tfind(vkey, vrootp, compar);
+  node_t *q;
+
+  if (rootp != NULL) {
+    q = *rootp;
+  } else {
+    // key not found. make new node and link to old
+    q = malloc(sizeof(node_t));
+    if (q != 0) {
+      *rootp = q;
+      q->key = (void *)vkey;
+      q->left = q->right = NULL;
+    }
+  }
+  return q;
+}
+
+void tdestroy(void *vroot, tdestroy_cb freefct) {
+  node_t *root = (node_t *)vroot;
+  if (root != NULL) {
+    tdestroy_recurse(root, freefct);
+  }
+}
+
+/* Walk the nodes of a tree */
+void twalk(const void *vroot, twalk_cb action) {
+  if (vroot != NULL && action != NULL) {
+    trecurse(vroot, action, 0);
+  }
+}
diff --git a/src/common/search.h b/src/common/search.h
new file mode 100644
index 00000000..8ddc10c9
--- /dev/null
+++ b/src/common/search.h
@@ -0,0 +1,29 @@
+// This file is part of SmallBASIC
+//
+// Written by J.T. Conklin <jtc@netbsd.org>
+// Public domain.
+//
+
+#ifndef _SEARCH_H_
+#define _SEARCH_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+typedef enum {
+  preorder,
+  postorder,
+  endorder,
+  leaf
+} VISIT;
+
+typedef void (*twalk_cb) (const void *nodep, VISIT value, int level);
+typedef void (*tdestroy_cb) (void *__nodep);
+typedef int (*tcompare_cb) (const void *, const void *);
+
+void *tfind(const void *vkey, void **vrootp, tcompare_cb compar);
+void *tsearch(const void *vkey, void **vrootp, tcompare_cb compar);
+void tdestroy(void *, tdestroy_cb cb);
+void twalk(const void *vroot, twalk_cb action);
+
+#endif /* !_SEARCH_H_ */
diff --git a/src/common/var_hash.c b/src/common/var_hash.c
index f6aea334..a212e0ec 100644
--- a/src/common/var_hash.c
+++ b/src/common/var_hash.c
@@ -12,9 +12,7 @@
 #include "common/var.h"
 #include "common/smbas.h"
 #include "common/var_hash.h"
-
-#if defined(HAVE_SEARCH_H)
-#include <search.h>
+#include "common/search.h"
 
 /**
  * Globals for callback access
@@ -46,35 +44,6 @@ typedef struct Node {
   Element *element;
 } Node;
 
-#if !defined(tdestroy) && !defined(HAVE_TDESTROY)
-// tdestroy() is missing from MingW. include code from gnu clib _search.c
-
-typedef struct node_t {
-  void *key;
-  struct node_t *left, *right;
-} node;
-
-typedef void (*__free_fn_t) (void *__nodep);
-
-tdestroy_recurse(node *root, __free_fn_t freefct) {
-  if (root->left != NULL) {
-    tdestroy_recurse(root->left, freefct);
-  }
-  if (root->right != NULL) {
-    tdestroy_recurse(root->right, freefct);
-  }
-  (*freefct) ((void *) root->key);
-  free(root);
-}
-
-void tdestroy(void *vroot, __free_fn_t freefct) {
-  node *root = (node *) vroot;
-  if (root != NULL) {
-    tdestroy_recurse (root, freefct);
-  }
-}
-#endif
-
 /**
  * Returns a new Element 
  */
@@ -293,31 +262,3 @@ void hash_write(const var_p_t var_p, int method, int handle) {
   }
 }
 
-#else
-
-// search.h not supported on this platform
-int hash_compare(const var_p_t var_a, const var_p_t var_b) {
-}
-int hash_is_empty(const var_p_t var_p) {
-}
-int hash_to_int(const var_p_t var_p) {
-}
-int hash_length(const var_p_t var_p) {
-}
-var_p_t hash_elem(const var_p_t var_p, int index) {
-}
-void hash_clear(const var_p_t var_p) {
-}
-void hash_free_var(var_p_t var_p) {
-}
-void hash_get_value(var_p_t base, var_p_t key, var_p_t *result) {
-}
-void hash_set(var_p_t dest, const var_p_t src) {
-}
-void hash_to_str(const var_p_t var_p, char *out, int max_len) {
-}
-void hash_write(const var_p_t var_p, int method, int handle) {
-}
-
-#endif
-
diff --git a/src/platform/android/Makefile.am b/src/platform/android/Makefile.am
new file mode 100644
index 00000000..802c2aeb
--- /dev/null
+++ b/src/platform/android/Makefile.am
@@ -0,0 +1,30 @@
+# SmallBASIC
+# Copyright(C) 2001-2014 Chris Warren-Smith.
+#
+# This program is distributed under the terms of the GPL v2.0 or later
+# Download the GNU Public License (GPL) from www.gnu.org
+# 
+
+all-am: Makefile ndk-build-test
+
+ndk-build-test:
+	(cd jni && ${NDK}/ndk-build NDK_DEBUG=1)
+
+ant-build-test: ndk-build-test
+	(cd ../../../ide/android && ant -quiet debug install)
+
+test: ant-build-test
+	(cd ../../../ide/android && \
+   adb -a logcat -c && \
+   adb -a shell am start net.sourceforge.smallbasic/net.sourceforge.smallbasic.MainActivity && \
+   adb -a logcat)
+
+clean-am: 
+	(cd jni && ${NDK}/ndk-build clean)
+
+ndk-build-release:
+	(cd jni && ${NDK}/ndk-build NDK_DEBUG=0)
+
+release: ndk-build-release
+	(cd ../../../ide/android && ant release install)
+
diff --git a/src/platform/android/common/Makefile.am b/src/platform/android/common/Makefile.am
deleted file mode 100755
index b7cfc888..00000000
--- a/src/platform/android/common/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-# SmallBASIC
-# Copyright(C) 2001-2013 Chris Warren-Smith.
-#
-# This program is distributed under the terms of the GPL v2.0 or later
-# Download the GNU Public License (GPL) from www.gnu.org
-# 
-
-COMMON=$(top_srcdir)/src/common
-
-ARFLAGS = Tru
-
-RANLIB=echo
-
-AM_CPPFLAGS=-I$(top_srcdir)/src @PACKAGE_CFLAGS@
-
-noinst_LIBRARIES = libsb_common.a
-
-all-am: Makefile $(LIBRARIES) ant-build
-
-libsb_common_a_SOURCES =                                      \
-    $(COMMON)/bc.c $(COMMON)/bc.h                             \
-    $(COMMON)/blib.c $(COMMON)/blib.h                         \
-    $(COMMON)/blib_db.c                                       \
-    $(COMMON)/blib_func.c                                     \
-    $(COMMON)/blib_graph.c                                    \
-    $(COMMON)/blib_math.c                                     \
-    $(COMMON)/matrix.c                                        \
-    $(COMMON)/blib_math.h                                     \
-    $(COMMON)/blib_sound.c                                    \
-    $(COMMON)/brun.c                                          \
-    $(COMMON)/ceval.c                                         \
-    $(COMMON)/circle.c                                        \
-    $(COMMON)/decomp.c                                        \
-    $(COMMON)/device.c $(COMMON)/device.h                     \
-    $(COMMON)/screen.c                                        \
-    $(COMMON)/system.c                                        \
-    $(COMMON)/drvmouse.h $(COMMON)/drvsound.h                 \
-    $(COMMON)/eval.c                                          \
-    $(COMMON)/extlib.c $(COMMON)/extlib.h                     \
-    $(COMMON)/file.c                                          \
-    $(COMMON)/ffill.c                                         \
-    $(COMMON)/fmt.c $(COMMON)/fmt.h                           \
-    $(COMMON)/fs_serial.c $(COMMON)/fs_serial.h               \
-    $(COMMON)/fs_socket_client.c $(COMMON)/fs_socket_client.h \
-    $(COMMON)/fs_stream.c $(COMMON)/fs_stream.h               \
-    $(COMMON)/g_line.c                                        \
-    $(COMMON)/geom.c $(COMMON)/geom.h $(COMMON)/g_bmp.h       \
-    $(COMMON)/inet.c $(COMMON)/inet.h                         \
-    $(COMMON)/kw.c $(COMMON)/kw.h                             \
-    $(COMMON)/match.c $(COMMON)/match.h                       \
-    $(COMMON)/mem.c                                           \
-    $(COMMON)/panic.c $(COMMON)/panic.h                       \
-    $(COMMON)/pfill.c                                         \
-    $(COMMON)/plot.c                                          \
-    $(COMMON)/proc.c $(COMMON)/pproc.h                        \
-    $(COMMON)/sberr.c $(COMMON)/sberr.h                       \
-    $(COMMON)/scan.c $(COMMON)/scan.h                         \
-    $(COMMON)/str.c $(COMMON)/str.h                           \
-    $(COMMON)/tasks.c $(COMMON)/tasks.h                       \
-    $(COMMON)/var_uds.c $(COMMON)/var_uds.h                   \
-    $(COMMON)/var_hash.c $(COMMON)/var_hash.h                 \
-    $(COMMON)/keymap.c $(COMMON)/keymap.h                     \
-    $(COMMON)/units.c $(COMMON)/units.h                       \
-    $(COMMON)/var.c $(COMMON)/var.h                           \
-    $(COMMON)/vmt.c $(COMMON)/vmt.h                           \
-    $(COMMON)/messages.h                                      \
-    $(COMMON)/osd.h                                           \
-    $(COMMON)/pdb.h                                           \
-    $(COMMON)/pmem.h                                          \
-    $(COMMON)/sbapp.h                                         \
-    $(COMMON)/smbas.h                                         \
-    $(COMMON)/sys.h
-
-../libs/armeabi/libsmallbasic.so: libsb_common.a
-
-ndk-build: ../libs/armeabi/libsmallbasic.so
-	(cd ../jni && ${NDK}/ndk-build NDK_DEBUG=1)
-
-ant-build: ndk-build
-	(cd ../../../../ide/android && ant -quiet debug install)
-
-test: ant-build
-	(cd ../../../../ide/android && \
-   adb -d logcat -c && \
-   adb shell am start net.sourceforge.smallbasic/net.sourceforge.smallbasic.MainActivity && \
-   adb -d logcat)
-
-
diff --git a/src/platform/android/jni/Android.mk b/src/platform/android/jni/Android.mk
index 93215683..c5fc049f 100644
--- a/src/platform/android/jni/Android.mk
+++ b/src/platform/android/jni/Android.mk
@@ -5,34 +5,25 @@
 # Download the GNU Public License (GPL) from www.gnu.org
 # 
 
-# see: ~/android-sdk/android-ndk-r9b/docs/ANDROID-MK.html
-
-LOCAL_PATH := $(call my-dir)
-SB_HOME := $(LOCAL_PATH)/../../../..
+JNI_PATH := $(call my-dir)
+SB_HOME := $(JNI_PATH)/../../../..
 PNG_HOME := $(HOME)/android-sdk/libpng-1.6.12/png
-FREETYPE_HOME := $(HOME)/android-sdk/freetype-2.5.3/freetype
+FREETYPE_HOME := $(HOME)/android-sdk/freetype-2.5.3
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := sb_common
-LOCAL_SRC_FILES := ../common/libsb_common.a
-include $(PREBUILT_STATIC_LIBRARY)
+include $(call all-subdir-makefiles)
+LOCAL_PATH := $(JNI_PATH)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := png
-LOCAL_SRC_FILES := $(PNG_HOME)/lib/libpng.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := freetype
-LOCAL_SRC_FILES := $(FREETYPE_HOME)/lib/libfreetype.a
-include $(PREBUILT_STATIC_LIBRARY)
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := png
+#LOCAL_SRC_FILES := $(PNG_HOME)/lib/libpng.a
+#include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE     := smallbasic
 LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1
 LOCAL_C_INCLUDES := $(SB_HOME) $(SB_HOME)/src \
-                    $(FREETYPE_HOME)/include \
-                    $(FREETYPE_HOME)/include/freetype2
+                    $(FREETYPE_HOME)/freetype/include \
+                    $(FREETYPE_HOME)/freetype/include/freetype2
 LOCAL_SRC_FILES  := main.cpp \
                     display.cpp \
                     runtime.cpp \
diff --git a/src/platform/android/jni/Application.mk b/src/platform/android/jni/Application.mk
index f58ddc73..bcf0161b 100644
--- a/src/platform/android/jni/Application.mk
+++ b/src/platform/android/jni/Application.mk
@@ -1,5 +1,3 @@
 APP_PLATFORM := android-9
-
-# uncomment for release
 APP_ABI := armeabi armeabi-v7a
 
diff --git a/src/platform/android/jni/common/Android.mk b/src/platform/android/jni/common/Android.mk
new file mode 100644
index 00000000..938e96d4
--- /dev/null
+++ b/src/platform/android/jni/common/Android.mk
@@ -0,0 +1,63 @@
+# SmallBASIC
+# Copyright(C) 2001-2014 Chris Warren-Smith.
+#
+# This program is distributed under the terms of the GPL v2.0 or later
+# Download the GNU Public License (GPL) from www.gnu.org
+# 
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+COMMON=$(SB_HOME)/src/common
+
+LOCAL_C_INCLUDES := $(SB_HOME) $(SB_HOME)/src
+LOCAL_MODULE     := sb_common
+LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1
+LOCAL_SRC_FILES  :=															\
+    $(COMMON)/bc.c															\
+    $(COMMON)/blib.c														\
+    $(COMMON)/blib_db.c													\
+    $(COMMON)/blib_func.c												\
+    $(COMMON)/blib_graph.c											\
+    $(COMMON)/blib_math.c												\
+    $(COMMON)/matrix.c													\
+    $(COMMON)/blib_sound.c											\
+    $(COMMON)/brun.c														\
+    $(COMMON)/ceval.c														\
+    $(COMMON)/circle.c													\
+    $(COMMON)/decomp.c													\
+    $(COMMON)/device.c													\
+    $(COMMON)/screen.c													\
+    $(COMMON)/system.c													\
+    $(COMMON)/eval.c														\
+    $(COMMON)/extlib.c													\
+    $(COMMON)/file.c														\
+    $(COMMON)/ffill.c														\
+    $(COMMON)/fmt.c															\
+    $(COMMON)/fs_serial.c												\
+    $(COMMON)/fs_socket_client.c								\
+    $(COMMON)/fs_stream.c												\
+    $(COMMON)/g_line.c													\
+    $(COMMON)/geom.c														\
+    $(COMMON)/inet.c														\
+    $(COMMON)/kw.c															\
+    $(COMMON)/match.c														\
+    $(COMMON)/mem.c															\
+    $(COMMON)/panic.c														\
+    $(COMMON)/pfill.c														\
+    $(COMMON)/plot.c														\
+    $(COMMON)/proc.c														\
+    $(COMMON)/sberr.c														\
+    $(COMMON)/scan.c														\
+    $(COMMON)/str.c															\
+    $(COMMON)/tasks.c														\
+    $(COMMON)/search.c													\
+    $(COMMON)/var_uds.c													\
+    $(COMMON)/var_hash.c												\
+    $(COMMON)/keymap.c													\
+    $(COMMON)/units.c														\
+    $(COMMON)/var.c															\
+    $(COMMON)/vmt.c
+
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/src/platform/android/jni/display.cpp b/src/platform/android/jni/display.cpp
index e1c62da2..c728ae2e 100644
--- a/src/platform/android/jni/display.cpp
+++ b/src/platform/android/jni/display.cpp
@@ -15,7 +15,6 @@
 
 #define FONT_FACE_REGULAR "Envy Code R.ttf"
 #define FONT_FACE_BOLD    "Envy Code R Bold.ttf"
-#define SIZE_LIMIT 10
 
 extern common::Graphics *graphics;
 
@@ -156,15 +155,3 @@ void maUpdateScreen(void) {
   ((Graphics *)graphics)->redraw();
 }
 
-int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
-  int result = RES_OK;
-  if (height > graphics->getHeight() * SIZE_LIMIT) {
-    result -= 1;
-  } else {
-    Canvas *drawable = (Canvas *)maHandle;
-    result = drawable->create(width, height) ? RES_OK : -1;
-  }
-  return result;
-}
-
-
diff --git a/src/platform/android/jni/freetype/Android.mk b/src/platform/android/jni/freetype/Android.mk
new file mode 100644
index 00000000..f702cf78
--- /dev/null
+++ b/src/platform/android/jni/freetype/Android.mk
@@ -0,0 +1,51 @@
+# SmallBASIC
+# Copyright(C) 2001-2014 Chris Warren-Smith.
+#
+# This program is distributed under the terms of the GPL v2.0 or later
+# Download the GNU Public License (GPL) from www.gnu.org
+# 
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := $(FREETYPE_HOME)/include \
+                    $(FREETYPE_HOME)/builds \
+                    $(FREETYPE_HOME)/include/config \
+                    $(FREETYPE_HOME)/include/freetype2
+LOCAL_MODULE     := freetype
+LOCAL_CFLAGS     := -Wall -std=gnu99 \
+                    "-DFT_CONFIG_CONFIG_H=<ftconfig.h>" \
+                    "-DFT2_BUILD_LIBRARY" \
+                    "-DFT_CONFIG_MODULES_H=<ftmodule.h>"
+
+LOCAL_SRC_FILES:=                               \
+  $(FREETYPE_HOME)/src/type1/type1.c            \
+  $(FREETYPE_HOME)/src/cid/type1cid.c           \
+  $(FREETYPE_HOME)/src/pfr/pfr.c                \
+  $(FREETYPE_HOME)/src/type42/type42.c          \
+  $(FREETYPE_HOME)/src/winfonts/winfnt.c        \
+  $(FREETYPE_HOME)/src/pcf/pcf.c                \
+  $(FREETYPE_HOME)/src/psaux/psaux.c            \
+  $(FREETYPE_HOME)/src/bdf/bdf.c                \
+  $(FREETYPE_HOME)/src/base/ftbbox.c            \
+  $(FREETYPE_HOME)/src/base/ftbitmap.c          \
+  $(FREETYPE_HOME)/src/base/ftglyph.c           \
+  $(FREETYPE_HOME)/src/base/ftstroke.c          \
+  $(FREETYPE_HOME)/src/base/ftxf86.c            \
+  $(FREETYPE_HOME)/src/base/ftbase.c            \
+  $(FREETYPE_HOME)/src/base/ftsystem.c          \
+  $(FREETYPE_HOME)/src/base/ftinit.c            \
+  $(FREETYPE_HOME)/src/base/ftgasp.c            \
+  $(FREETYPE_HOME)/src/raster/raster.c          \
+  $(FREETYPE_HOME)/src/sfnt/sfnt.c              \
+  $(FREETYPE_HOME)/src/smooth/smooth.c          \
+  $(FREETYPE_HOME)/src/autofit/autofit.c        \
+  $(FREETYPE_HOME)/src/truetype/truetype.c      \
+  $(FREETYPE_HOME)/src/cff/cff.c                \
+  $(FREETYPE_HOME)/src/psnames/psnames.c        \
+  $(FREETYPE_HOME)/src/pshinter/pshinter.c      \
+  $(FREETYPE_HOME)/src/gzip/ftgzip.c            \
+  $(FREETYPE_HOME)/src/lzw/ftlzw.c              \
+  $(FREETYPE_HOME)/src/lzw/ftzopen.c
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/platform/android/jni/runtime.cpp b/src/platform/android/jni/runtime.cpp
index 9128e5db..6e923437 100644
--- a/src/platform/android/jni/runtime.cpp
+++ b/src/platform/android/jni/runtime.cpp
@@ -24,11 +24,10 @@
 #include "common/fs_socket_client.h"
 
 #define WAIT_INTERVAL 10
-#define DEFAULT_FONT_SIZE 30
 #define MAIN_BAS "__main_bas__"
 #define CONFIG_FILE "/settings.txt"
 #define PATH_KEY "path"
-#define FONT_SCALE_KEY "fontScale"
+#define FONT_SCALE_KEY "fontScale2"
 #define SERVER_SOCKET_KEY "serverSocket"
 #define SERVER_TOKEN_KEY "serverToken"
 
@@ -136,7 +135,7 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_r
 
 extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onResize
   (JNIEnv *env, jclass jclazz, jint width, jint height) {
-  if (runtime != NULL && runtime->isActive()) {
+  if (runtime != NULL && runtime->isActive() && os_graphics) {
     runtime->onResize(width, height);
   }
 }
@@ -223,6 +222,17 @@ String Runtime::getString(const char *methodName) {
   return result;
 }
 
+int Runtime::getInteger(const char *methodName) {
+  JNIEnv *env;
+  _app->activity->vm->AttachCurrentThread(&env, NULL);
+  jclass clazz = env->GetObjectClass(_app->activity->clazz);
+  jmethodID methodId = env->GetMethodID(clazz, methodName, "()I");
+  jint result = env->CallIntMethod(_app->activity->clazz, methodId);
+  env->DeleteLocalRef(clazz);
+  _app->activity->vm->DetachCurrentThread();
+  return result;
+}
+
 int Runtime::getUnicodeChar(int keyCode, int metaState) {
   JNIEnv *env;
   _app->activity->vm->AttachCurrentThread(&env, NULL);
@@ -309,8 +319,11 @@ void Runtime::loadConfig() {
   String path;
   Properties profile;
 
+  int fontSize = getInteger("getStartupFontSize");
+  trace("fontSize = %d", fontSize);
+
   _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
-  _output->setFontSize(DEFAULT_FONT_SIZE);
+  _output->setFontSize(fontSize);
   _initialFontSize = _output->getFontSize();
 
   path.append(_app->activity->internalDataPath);
@@ -592,8 +605,8 @@ void Runtime::onResize(int width, int height) {
     int h = _graphics->getHeight();
     if (w != width || h != height) {
       trace("Resized from %d %d to %d %d", w, h, width, height);
-      _graphics->setSize(width, height);
       ALooper_acquire(_app->looper);
+      _graphics->setSize(width, height);
       MAEvent *maEvent = new MAEvent();
       maEvent->type = EVENT_TYPE_SCREEN_CHANGED;
       runtime->pushEvent(maEvent);
diff --git a/src/platform/android/jni/runtime.h b/src/platform/android/jni/runtime.h
index cb91b744..b0da0dee 100644
--- a/src/platform/android/jni/runtime.h
+++ b/src/platform/android/jni/runtime.h
@@ -25,7 +25,8 @@ struct Runtime : public System {
   void clearSoundQueue();
   void construct();
   bool getUntrusted();
-  String getString(const char *method);
+  String getString(const char *methodName);
+  int getInteger(const char *methodName);
   int getUnicodeChar(int keyCode, int metaState);
   void redraw() { _graphics->redraw(); }
   void handleKeyEvent(MAEvent &event);
diff --git a/src/platform/android/src/net/sourceforge/smallbasic/MainActivity.java b/src/platform/android/src/net/sourceforge/smallbasic/MainActivity.java
index 51228491..bff4275a 100644
--- a/src/platform/android/src/net/sourceforge/smallbasic/MainActivity.java
+++ b/src/platform/android/src/net/sourceforge/smallbasic/MainActivity.java
@@ -38,15 +38,21 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Base64;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.InputDevice;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView.AdapterContextMenuInfo;
 
 /**
  * Extends NativeActivity to provide interface methods for runtime.cpp
@@ -59,10 +65,12 @@ public class MainActivity extends NativeActivity {
   private static final String WEB_BAS = "web.bas";
   private static final String SCHEME_BAS = "qrcode.bas";
   private static final String SCHEME = "smallbasic://x/";
+  private static final int BASE_FONT_SIZE = 18;
   private String _startupBas = null;
   private boolean _untrusted = false;
   private ExecutorService _audioExecutor = Executors.newSingleThreadExecutor();
   private Queue<Sound> _sounds = new ConcurrentLinkedQueue<Sound>();
+  private String[] options = null;
 
   static {
     System.loadLibrary("smallbasic");
@@ -108,6 +116,11 @@ public String getStartupBas() {
     return this._startupBas == null ? "" : this._startupBas;
   }
 
+  public int getStartupFontSize() {
+    DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics();
+    return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, BASE_FONT_SIZE, metrics);
+  }
+
   public int getUnicodeChar(int keyCode, int metaState) {
     int result = 0;
     InputDevice device = InputDevice.getDevice(InputDevice.getDeviceIds()[0]);
@@ -133,19 +146,38 @@ public void onGlobalLayout() {
     onResize(rect.width(), rect.height());
   }
 
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    if (this.options != null) {
+      int index = 0;
+      while (index < this.options.length) {
+        if (options[index].equals(item.toString())) {
+          break;
+        }
+        index++;
+      }
+      Log.i(TAG, "items clicked = " + index);
+      optionSelected(index);
+    }
+    return true;
+  }
+  
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    if (this.options != null) {
+      menu.clear();
+      for (String option : this.options) {
+        menu.add(option);
+      }
+    }
+    return super.onPrepareOptionsMenu(menu);
+  }
+
   public void optionsBox(final String[] items) {
-    final Activity activity = this;
+    this.options = items;
     runOnUiThread(new Runnable() {
       public void run() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setItems(items, new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int index) {
-            Log.i(TAG, "items clicked = " + index);
-            optionSelected(index);
-          }
-        });
-        builder.create().show();
+        openOptionsMenu();
       }
     });
   }
diff --git a/src/platform/android/src/net/sourceforge/smallbasic/Sound.java b/src/platform/android/src/net/sourceforge/smallbasic/Sound.java
index f4a1e8f9..23a54355 100644
--- a/src/platform/android/src/net/sourceforge/smallbasic/Sound.java
+++ b/src/platform/android/src/net/sourceforge/smallbasic/Sound.java
@@ -15,7 +15,8 @@
 @TargetApi(Build.VERSION_CODES.GINGERBREAD)
 public class Sound {
   private static final String TAG = "smallbasic";
-  static final int AUDIO_SAMPLE_RATE = 8000;
+  private static final int AUDIO_SAMPLE_RATE = 8000;
+  private static final int WAVE_MAX = 32000;
   private byte[] _sound;
   private float _volume;
   private int _dur;
@@ -78,7 +79,7 @@ private final byte[] generateTone(int freqOfTone, int durationMillis) {
       // Ramp amplitude up (to avoid clicks)
       double dVal = sample[i];
       // Ramp up to maximum
-      final short val = (short) ((dVal * 32767 * i / ramp));
+      final short val = (short) ((dVal * WAVE_MAX * i / ramp));
       // in 16 bit wav PCM, first byte is the low order byte
       result[idx++] = (byte) (val & 0x00ff);
       result[idx++] = (byte) ((val & 0xff00) >>> 8);
@@ -89,7 +90,7 @@ private final byte[] generateTone(int freqOfTone, int durationMillis) {
       // Max amplitude for most of the samples
       double dVal = sample[i];
       // scale to maximum amplitude
-      final short val = (short) ((dVal * 32767));
+      final short val = (short) ((dVal * WAVE_MAX));
       // in 16 bit wav PCM, first byte is the low order byte
       result[idx++] = (byte) (val & 0x00ff);
       result[idx++] = (byte) ((val & 0xff00) >>> 8);
@@ -100,7 +101,7 @@ private final byte[] generateTone(int freqOfTone, int durationMillis) {
       // Ramp amplitude down
       double dVal = sample[i];
       // Ramp down to zero
-      final short val = (short) ((dVal * 32767 * (numSamples - i) / ramp));
+      final short val = (short) ((dVal * WAVE_MAX * (numSamples - i) / ramp));
       // in 16 bit wav PCM, first byte is the low order byte
       result[idx++] = (byte) (val & 0x00ff);
       result[idx++] = (byte) ((val & 0xff00) >>> 8);
diff --git a/src/platform/common/ansiwidget.cpp b/src/platform/common/ansiwidget.cpp
index 36959906..c64e3efd 100755
--- a/src/platform/common/ansiwidget.cpp
+++ b/src/platform/common/ansiwidget.cpp
@@ -48,7 +48,7 @@
 
 #define BUTTON_PADDING 10
 #define OVER_SCROLL 100
-
+#define H_SCROLL_SIZE 10
 #define SWIPE_MAX_TIMER 3000
 #define SWIPE_DELAY_STEP 200
 #define SWIPE_MAX_DURATION 300
@@ -138,11 +138,23 @@ void Widget::drawButton(const char *caption, int dx, int dy,
   }
 }
 
-void Widget::drawLink(const char *caption, int dx, int dy) {
+void Widget::drawLink(const char *caption, int dx, int dy, int sw, int chw) {
   maSetColor(_fg);
-  maDrawText(dx, dy, caption);
+  int len = strlen(caption);
+  int width = min(sw, _width) - dx;
+  if ((len * chw) > width) {
+    int len = width / chw;
+    char *buffer = new char[len + 1];
+    strncpy(buffer, caption, len - 1);
+    buffer[len - 1] = '~';
+    buffer[len] = 0;
+    maDrawText(dx, dy, buffer);
+    delete [] buffer;
+  } else {
+    maDrawText(dx, dy, caption);
+  }
   maSetColor(_pressed ? _fg : _bg);
-  maLine(dx + 2, dy + _height + 1, dx + _width, dy + _height + 1);
+  maLine(dx + 2, dy + _height - 1, dx + min(sw, _width), dy + _height - 1);
 }
 
 bool Widget::overlaps(MAPoint2d pt, int offsX, int offsY, bool &redraw) {
@@ -218,7 +230,7 @@ FormLineInput::FormLineInput(Screen *screen, char *buffer, int maxSize,
   _scroll(0) {
 }
 
-void FormLineInput::draw(int dx, int dy) {
+void FormLineInput::draw(int dx, int dy, int sw, int chw) {
   maSetColor(getBackground(GRAY_BG_COL));
   maFillRect(dx, dy, _width, _height);
   maSetColor(_fg);
@@ -771,8 +783,9 @@ bool AnsiWidget::pointerMoveEvent(MAEvent &event) {
     if (vscroll < 0) {
       vscroll = 0;
     }
-    if ((hscroll != _front->_scrollX && maxHScroll > 0 &&
-         hscroll <= maxHScroll) ||
+    if ((abs(hscroll - _front->_scrollX) > H_SCROLL_SIZE
+         && maxHScroll > 0
+         && hscroll <= maxHScroll) ||
         (vscroll != _front->_scrollY && maxVScroll > 0 &&
          vscroll < maxVScroll + OVER_SCROLL)) {
       _front->drawInto();
@@ -856,11 +869,11 @@ Widget *AnsiWidget::createLink(const char *action, const char *text,
     _back->_linePadding = BUTTON_PADDING;
   }
   if (_back->_curX + w >= _width) {
-    w = _width - _back->_curX; // clipped
-    _back->newLine(EXTENT_Y(textSize) + LINE_SPACING);
-  } else {
-    _back->_curX += w;
+    // clipped
+    w = _width - _back->_curX - BUTTON_PADDING;
   }
+  _back->_curX += w;
+
   Widget *result;
   if (formLink) {
     result = new FormLink(_back, action, x, y, w, h);
@@ -885,7 +898,7 @@ bool AnsiWidget::doEscape(char *&p, int textHeight) {
   int escValue = 0;
 
   while (isdigit(*p)) {
-    escValue = (escValue *10) + (*p - '0');
+    escValue = (escValue * 10) + (*p - '0');
     p++;
   }
 
@@ -986,7 +999,7 @@ void AnsiWidget::drawActiveButton() {
   int x = _focus->_x + _activeButton->_x;
   int y = _focus->_y + _activeButton->_y - _focus->_scrollY;
   maSetClipRect(x, y, _activeButton->_width, _activeButton->_height + 2);
-  _activeButton->draw(x, y);
+  _activeButton->draw(x, y, _front->w(), _front->_charWidth);
   maUpdateScreen();
   maResetBacklight();
   maSetDrawTarget(currentHandle);
diff --git a/src/platform/common/ansiwidget.h b/src/platform/common/ansiwidget.h
index 34ba0326..3982683c 100755
--- a/src/platform/common/ansiwidget.h
+++ b/src/platform/common/ansiwidget.h
@@ -4,7 +4,7 @@
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
-// 
+//
 
 #ifndef ANSIWIDGET_H
 #define ANSIWIDGET_H
@@ -37,7 +37,7 @@ struct Widget : public Shape {
   virtual void clicked(IButtonListener *listener, int x, int y) = 0;
   virtual bool overlaps(MAPoint2d pt, int scrollX, int scrollY, bool &redraw);
   void drawButton(const char *caption, int x, int y, int w, int h, bool pressed);
-  void drawLink(const char *caption, int x, int y);
+  void drawLink(const char *caption, int x, int y, int sw, int chw);
   int getBackground(int buttonColor);
 
   bool _pressed;
@@ -60,7 +60,9 @@ struct TextButton : public Button {
   TextButton(Screen *screen, const char *action, const char *label,
              int x, int y, int w, int h) :
   Button(screen, action, label, x, y, w, h) {}
-  void draw(int x, int y) { drawLink(_label.c_str(), x, y); }
+  void draw(int x, int y, int bw, int cw) {
+    drawLink(_label.c_str(), x, y, bw, cw);
+  }
 };
 
 // internal block button
@@ -68,8 +70,8 @@ struct BlockButton : public Button {
   BlockButton(Screen *screen, const char *action, const char *label,
               int x, int y, int w, int h) :
   Button(screen, action, label, x, y, w, h) {}
-  void draw(int x, int y) { 
-    drawButton(_label.c_str(), x, y, _width, _height, _pressed); 
+  void draw(int x, int y, int bw, int cw) {
+    drawButton(_label.c_str(), x, y, _width, _height, _pressed);
   }
 };
 
@@ -105,8 +107,8 @@ struct FormButton : public FormWidget {
   virtual ~FormButton() {}
 
   const char *getText() const { return _caption.c_str(); }
-  void draw(int x, int y) { 
-    drawButton(_caption.c_str(), x, y, _width, _height, _pressed); 
+  void draw(int x, int y, int sw, int chw) {
+    drawButton(_caption.c_str(), x, y, _width, _height, _pressed);
   }
   void clicked(IButtonListener *listener, int x, int y);
   void setText(const char *text) { _caption = text; }
@@ -120,7 +122,7 @@ struct FormLabel : public FormWidget {
   virtual ~FormLabel() {}
 
   const char *getText() const { return _caption.c_str(); }
-  void draw(int x, int y) { 
+  void draw(int x, int y, int sw, int chw) {
     drawButton(_caption.c_str(), x, y, _width, _height, false);
   }
   void setText(const char *text) { _caption = text; }
@@ -134,19 +136,21 @@ struct FormLink : public FormWidget {
   virtual ~FormLink() {}
 
   const char *getText() const { return _link.c_str(); }
-  void draw(int x, int y) { drawLink(_link.c_str(), x, y); }
+  void draw(int x, int y, int sw, int chw) {
+    drawLink(_link.c_str(), x, y, sw, chw);
+  }
 
 private:
   String _link;
 };
 
 struct FormLineInput : public FormWidget {
-  FormLineInput(Screen *screen, char *buffer, int maxSize, 
+  FormLineInput(Screen *screen, char *buffer, int maxSize,
                 int x, int y, int w, int h);
   virtual ~FormLineInput() {}
 
   void close();
-  void draw(int x, int y);
+  void draw(int x, int y, int sw, int chw);
   bool edit(int key);
   const char *getText() const { return _buffer; }
   void setText(const char *text) {}
@@ -158,7 +162,7 @@ struct FormLineInput : public FormWidget {
 };
 
 struct FormList : public FormWidget {
-  FormList(Screen *screen, IFormWidgetListModel *model, 
+  FormList(Screen *screen, IFormWidgetListModel *model,
            int x, int y, int w, int h);
   virtual ~FormList() {}
 
@@ -173,7 +177,7 @@ struct FormList : public FormWidget {
 };
 
 struct FormDropList : public FormList {
-  FormDropList(Screen *screen, IFormWidgetListModel *model, 
+  FormDropList(Screen *screen, IFormWidgetListModel *model,
                int x, int y, int w, int h);
   void clicked(IButtonListener *listener, int x, int y);
   void draw(int dx, int dy);
@@ -189,7 +193,7 @@ struct FormDropList : public FormList {
 };
 
 struct FormListBox : public FormList {
-  FormListBox(Screen *screen, IFormWidgetListModel *model, 
+  FormListBox(Screen *screen, IFormWidgetListModel *model,
               int x, int y, int w, int h);
   void clicked(IButtonListener *listener, int x, int y);
   void draw(int dx, int dy);
@@ -264,7 +268,7 @@ struct AnsiWidget {
 
   Screen *_screens[MAX_SCREENS];
   Screen *_back;   // screen being painted/written
-  Screen *_front;  // screen to display 
+  Screen *_front;  // screen to display
   Screen *_focus;  // screen with the active button
   int _width;      // device screen width
   int _height;     // device screen height
diff --git a/src/platform/common/canvas.h b/src/platform/common/canvas.h
index 12ed728d..2540aca1 100644
--- a/src/platform/common/canvas.h
+++ b/src/platform/common/canvas.h
@@ -12,8 +12,9 @@
 typedef uint16_t pixel_t;
 
 #if defined(_SDL)
-
 #include <SDL.h>
+#define MAX_CANVAS_SIZE 10
+
 struct Canvas {
   Canvas();
   virtual ~Canvas();
@@ -33,8 +34,9 @@ struct Canvas {
 };
 
 #else
-
 #include <android/rect.h>
+#define MAX_CANVAS_SIZE 10
+
 struct Canvas {
   Canvas();
   virtual ~Canvas();
diff --git a/src/platform/common/graphics.cpp b/src/platform/common/graphics.cpp
index f0ae7be0..08d155f4 100644
--- a/src/platform/common/graphics.cpp
+++ b/src/platform/common/graphics.cpp
@@ -381,3 +381,14 @@ MAHandle maSetDrawTarget(MAHandle maHandle) {
   return graphics->setDrawTarget(maHandle);
 }
 
+int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
+  int result = RES_OK;
+  int maxSize = max(graphics->getWidth(), graphics->getHeight());
+  if (height > maxSize * MAX_CANVAS_SIZE) {
+    result -= 1;
+  } else {
+    Canvas *drawable = (Canvas *)maHandle;
+    result = drawable->create(width, height) ? RES_OK : -1;
+  }
+  return result;
+}
diff --git a/src/platform/common/screen.cpp b/src/platform/common/screen.cpp
index e763adf4..1f94d46e 100644
--- a/src/platform/common/screen.cpp
+++ b/src/platform/common/screen.cpp
@@ -128,7 +128,7 @@ void Screen::drawOverlay(bool vscroll) {
     Shape *rect = (*it);
     if (rect->_y >= _scrollY && 
         rect->_y + rect->_height <= _scrollY + _height) {
-      rect->draw(_x + rect->_x, _y + rect->_y - _scrollY);
+      rect->draw(_x + rect->_x, _y + rect->_y - _scrollY, w(), _charWidth);
     }
   }
 
@@ -498,12 +498,17 @@ void GraphicScreen::resize(int newWidth, int newHeight, int oldWidth, int oldHei
     dstPoint.x = 0;
     dstPoint.y = 0;
 
-    maCreateDrawableImage(newImage, newImageWidth, newImageHeight);
-    maSetDrawTarget(newImage);
-    maSetColor(_bg);
-    maFillRect(0, 0, newImageWidth, newImageHeight);
-    maDrawImageRegion(_image, &srcRect, &dstPoint, TRANS_NONE);
-    maDestroyPlaceholder(_image);
+    if (maCreateDrawableImage(newImage, newImageWidth, newImageHeight) == RES_OK) {
+      maSetDrawTarget(newImage);
+      maSetColor(_bg);
+      maFillRect(0, 0, newImageWidth, newImageHeight);
+      maDrawImageRegion(_image, &srcRect, &dstPoint, TRANS_NONE);
+      maDestroyPlaceholder(_image);
+    } else {
+      // cannot resize - alert and abort
+      deviceLog("Failed to resize to %d %d", newImageWidth, newImageHeight);
+      abort();
+    }
 
     _image = newImage;
     _imageWidth = newImageWidth;
diff --git a/src/platform/common/screen.h b/src/platform/common/screen.h
index 851a4ae9..e21cd80e 100755
--- a/src/platform/common/screen.h
+++ b/src/platform/common/screen.h
@@ -34,7 +34,7 @@ using namespace strlib;
 struct Shape {
   Shape(int x, int y, int w, int h) : _x(x), _y(y), _width(w), _height(h) {}
   virtual ~Shape() {}
-  virtual void draw(int x, int y) {}
+  virtual void draw(int x, int y, int bw, int cw) {}
 
   int w() { return _width; }
   int h() { return _height; }
diff --git a/src/platform/common/system.cpp b/src/platform/common/system.cpp
index d05bb5f7..a8b421fe 100644
--- a/src/platform/common/system.cpp
+++ b/src/platform/common/system.cpp
@@ -19,7 +19,7 @@
 #include "common/blib_ui.h"
 #include "common/fs_socket_client.h"
 
-#define SYSTEM_MENU   "\033[ OConsole|Show Keypad|View Source|Restart"
+#define SYSTEM_MENU   "\033[ OConsole|Show keypad|View source|Restart"
 #define MENU_CONSOLE  0
 #define MENU_KEYPAD   1
 #define MENU_SOURCE   2
@@ -230,7 +230,6 @@ char *System::loadResource(const char *fileName) {
     int handle = 1;
     var_t *var_p = v_new();
     dev_file_t *f = dev_getfileptr(handle);
-    systemPrint(fileName);
     _output->print("\033[ LLoading...");
     if (dev_fopen(handle, fileName, 0)) {
       http_read(f, var_p, 0);
diff --git a/src/platform/sdl/display.cpp b/src/platform/sdl/display.cpp
index 18e2aeff..3eea0d7e 100644
--- a/src/platform/sdl/display.cpp
+++ b/src/platform/sdl/display.cpp
@@ -13,8 +13,6 @@
 #include "platform/sdl/display.h"
 #include "common/device.h"
 
-#define SIZE_LIMIT 10
-
 extern common::Graphics *graphics;
 
 //
@@ -136,14 +134,4 @@ void maUpdateScreen(void) {
   ((::Graphics *)graphics)->redraw();
 }
 
-int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
-  int result = RES_OK;
-  if (height > graphics->getHeight() * SIZE_LIMIT) {
-    result -= 1;
-  } else {
-    Canvas *drawable = (Canvas *)maHandle;
-    result = drawable->create(width, height) ? RES_OK : -1;
-  }
-  return result;
-}
 
diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
index 02e16c5d..4fe26592 100644
--- a/src/platform/sdl/main.cpp
+++ b/src/platform/sdl/main.cpp
@@ -200,7 +200,7 @@ int main(int argc, char* argv[]) {
 
   restoreSettings(CONFIG_NAME, rect, fontScale);
   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS);
-  SDL_Window *window = SDL_CreateWindow("SmallBASIC", 
+  SDL_Window *window = SDL_CreateWindow("SmallBASIC - [Break=Ctrl+c] [Menu=Ctrl+m] [Back=Ctrl+b]", 
                                         rect.x, rect.y, rect.w, rect.h,
                                         SDL_WINDOW_SHOWN | 
                                         SDL_WINDOW_RESIZABLE |
diff --git a/src/platform/sdl/runtime.cpp b/src/platform/sdl/runtime.cpp
index 681d3f01..f17f7886 100644
--- a/src/platform/sdl/runtime.cpp
+++ b/src/platform/sdl/runtime.cpp
@@ -176,9 +176,9 @@ void Runtime::pollEvents(bool blocking) {
       case SDL_KEYDOWN:
         if (ev.key.keysym.sym == SDLK_c && (ev.key.keysym.mod & KMOD_CTRL)) {
           runtime->setExit(true);
-        } else if (ev.key.keysym.sym == SDLK_HOME && (ev.key.keysym.mod & KMOD_CTRL)) {
+        } else if (ev.key.keysym.sym == SDLK_m && (ev.key.keysym.mod & KMOD_CTRL)) {
           showMenu();
-        } else if (ev.key.keysym.sym == SDLK_BACKSPACE && (ev.key.keysym.mod & KMOD_CTRL)) {
+        } else if (ev.key.keysym.sym == SDLK_b && (ev.key.keysym.mod & KMOD_CTRL)) {
           setBack();
         } else {
           maEvent = new MAEvent();