diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index b8fb425..bdc30fb 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,12 @@
-#Wed Nov 14 13:33:03 CST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+#Sat Oct 16 13:11:59 JST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/build.xml b/build.xml
index e7dbbf4..8ee4a0f 100644
--- a/build.xml
+++ b/build.xml
@@ -48,13 +48,15 @@
 
     <target name="check-proguard">
         <available file="tools/proguard.jar" property="have.proguard"/>
+        <echo message="have.proguard ${have.proguard}"/>
     </target>
 
     <target name="proguard" depends="check-proguard">
         <fail unless="have.proguard">You requested ProGuard, but you don't have the JAR available! See README</fail>
     </target>
 
-    <target name="-pre-build" depends="create-out-dir, link-out-dir, update-version"/>
+    <!--<target name="-pre-build" depends="create-out-dir, link-out-dir, update-version"/>-->
+    <target name="-pre-build" depends="create-out-dir, link-out-dir"/>
 
     <target name="-post-compile" depends="proguard-execute"/>
 
@@ -70,11 +72,13 @@
         <delete dir="${proguard.out.dir}"/>
     </target>
 
-    <target name="create-out-dir" depends="delete-out-dir" if="have.proguard">
+    <target name="create-out-dir" depends="delete-out-dir, check-proguard" if="have.proguard">
+    	<echo message="mkdir" />
         <mkdir dir="${proguard.out.dir}"/>
     </target>
 
-    <target name="link-out-dir" depends="delete-out-dir" unless="have.proguard">
+    <target name="link-out-dir" depends="delete-out-dir, check-proguard" unless="have.proguard">
+    	<echo message="symlink" />
         <symlink link="${proguard.out.dir}" resource="${out.classes.dir}"/>
     </target>
 
@@ -147,7 +151,7 @@
             <arg value="clean"/>
         </exec>
     </target>
-
+<!--
     <target name="tests" depends="install">
         <echo>Building and installing tests...</echo>
         <exec executable="ant" failonerror="true">
@@ -170,7 +174,7 @@
             </condition>
         </fail>
     </target>
-
+-->
 <!-- End custom ConnectBot stuff -->
 
     <taskdef name="setup"
diff --git a/src/org/connectbot/service/TerminalKeyListener.java b/src/org/connectbot/service/TerminalKeyListener.java
old mode 100644
new mode 100755
index e768134..50bc8f4
--- a/src/org/connectbot/service/TerminalKeyListener.java
+++ b/src/org/connectbot/service/TerminalKeyListener.java
@@ -170,6 +170,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
 
 				metaState &= ~(META_SLASH | META_TAB);
 
+				/*
 				if ((metaState & META_SHIFT_MASK) != 0) {
 					curMetaState |= KeyEvent.META_SHIFT_ON;
 					metaState &= ~META_SHIFT_ON;
@@ -181,6 +182,17 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
 					metaState &= ~META_ALT_ON;
 					bridge.redraw();
 				}
+				*/
+
+				if ((curMetaState & 0x08) != 0) {
+					metaState |= META_CTRL_ON;
+					bridge.redraw();
+				}
+
+				if (event.isAltPressed()) {
+					metaState |= META_ALT_ON;
+					bridge.redraw();
+				}
 
 				int key = keymap.get(keyCode, curMetaState);
 
@@ -204,11 +216,17 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha
 						key = 0x7F;
 				}
 
+				/*
 				// handle pressing f-keys
 				if ((hardKeyboard && !hardKeyboardHidden)
 						&& (curMetaState & KeyEvent.META_SHIFT_ON) != 0
 						&& sendFunctionKey(keyCode))
 					return true;
+				*/
+
+				if ((metaState & META_ALT_MASK) != 0) {
+					sendEscape();
+				}
 
 				if (key < 0x80)
 					bridge.transport.write(key);