diff --git a/res/menu/actions.xml b/res/menu/actions.xml
index 334e9b4..cbded8f 100644
--- a/res/menu/actions.xml
+++ b/res/menu/actions.xml
@@ -5,26 +5,26 @@
     <item android:id="@+id/action_keyboard"
           android:icon="@drawable/ic_bt_keyboard_hid"
           android:showAsAction="ifRoom"
-          android:title="@+id/input_keyboard" />
+          android:title="@string/input_keyboard" />
 
     <item android:id="@+id/action_joystick"
           android:icon="@drawable/ic_bt_misc_hid"
           android:showAsAction="ifRoom"
-          android:title="@+id/input_joystick" />
+          android:title="@string/input_joystick" />
 
     <item android:id="@+id/action_speed"
           android:icon="@drawable/dial"
           android:showAsAction="ifRoom"
-          android:title="@+id/emulation_speed" />
+          android:title="@string/emulation_speed" />
 
     <item android:id="@+id/action_function"
           android:icon="@drawable/ic_dialog_attach"
           android:showAsAction="never"
-          android:title="@+id/more_keys" />
+          android:title="@string/more_keys" />
 
     <item android:id="@+id/action_diskimage"
           android:icon="@drawable/ic_menu_save"
           android:showAsAction="ifRoom"
-          android:title="@+id/diskimage" />
+          android:title="@string/diskimage" />
 
 </menu>
diff --git a/src/com/froop/app/kegs/KegsTouch.java b/src/com/froop/app/kegs/KegsTouch.java
index a102d44..294732d 100644
--- a/src/com/froop/app/kegs/KegsTouch.java
+++ b/src/com/froop/app/kegs/KegsTouch.java
@@ -23,6 +23,9 @@ class KegsTouch {
   private int mPrimaryLastX = -1;  // last seen X
   private int mPrimaryLastY = -1;  // last seen Y
 
+  private int mSecondaryX = -1;  // in case of promotion to primary
+  private int mSecondaryY = -1;  // in case of promotion to primary
+
   private static final int LONG_PRESS = 1;
   private static final int LONG_PRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout();
 
@@ -37,13 +40,27 @@ class KegsTouch {
   private Handler mHandler = new Handler() {
     public void handleMessage(Message msg) {
       if (msg.what == LONG_PRESS) {
-        mPrimaryLongPress = true;
-        mButton1 = 1;
-        mEventQueue.add(new Event.MouseKegsEvent(0, 0, mButton1, 1));
+        if (mPrimaryId != -1) {
+          mPrimaryLongPress = true;
+          mButton1 = 1;
+          mEventQueue.add(new Event.MouseKegsEvent(0, 0, mButton1, 1));
+        }
       }
     }
   };
 
+  // For promotion of secondary to primary.  Crazy stuff.
+  private boolean checkSecondarySlop(MotionEvent newPoint, int index) {
+    final int deltaX = (int)newPoint.getX(index) - mSecondaryX;
+    final int deltaY = (int)newPoint.getY(index) - mSecondaryY;
+    final int distance = (deltaX * deltaX) + (deltaY * deltaY);
+    if (distance > mTouchSlopSquare) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   private boolean checkPrimarySlop(MotionEvent newPoint, int index) {
     if (mPrimaryPastSlop) {
       return true;
@@ -83,6 +100,8 @@ class KegsTouch {
       } else {
         // Any subequent fingers become the mouse button.
         mSecondaryId = pointerId;
+        mSecondaryX = (int)event.getX(pointerIndex);
+        mSecondaryY = (int)event.getY(pointerIndex);
         mButton1 = 1;
         mEventQueue.add(new Event.MouseKegsEvent(0, 0, mButton1, 1));
       }
@@ -113,6 +132,8 @@ class KegsTouch {
         mButton1 = 0;
         mEventQueue.add(new Event.MouseKegsEvent(0, 0, mButton1, 1));
         mSecondaryId = -1;
+        mSecondaryX = -1;
+        mSecondaryY = -1;
         return true;
       }
     } else if (action == MotionEvent.ACTION_CANCEL) {
@@ -128,6 +149,8 @@ class KegsTouch {
         return true;
       } else if (pointerId == mSecondaryId) {
         mSecondaryId = -1;
+        mSecondaryX = -1;
+        mSecondaryY = -1;
         if ((mButton1 & 1) == 1) {
           mButton1 = 0;
           mEventQueue.add(new Event.MouseKegsEvent(0, 0, mButton1, 1));
@@ -135,19 +158,47 @@ class KegsTouch {
         return true;
       }
     } else if (action == MotionEvent.ACTION_MOVE) {
-      if (pointerId == mPrimaryId) {
-        if (checkPrimarySlop(event, pointerIndex)) {
-          mHandler.removeMessages(LONG_PRESS);
-          final int currentX = (int)event.getX(pointerIndex);
-          final int currentY = (int)event.getY(pointerIndex);
-          final int changeX = currentX - mPrimaryLastX;
-          final int changeY = currentY - mPrimaryLastY;
-          mPrimaryLastX = currentX;
-          mPrimaryLastY = currentY;
-          mEventQueue.add(new Event.MouseKegsEvent(changeX, changeY, mButton1, 1));
+      // This doesn't use getActionIndex(), we need to check the entire event.
+      int moveIndex;
+      int moveId;
+      for(moveIndex = 0; moveIndex < event.getPointerCount(); moveIndex++) {
+        moveId = event.getPointerId(moveIndex);
+
+        if (moveId == mSecondaryId && mPrimaryId != -1 && !mPrimaryPastSlop && mSecondaryX != -1 && mSecondaryY != -1) {
+          // If the secondary goes past slop now, swap primary and secondary...
+          // This allows you to click with one finger, and then drag the next
+          // and that drag becomes the primary finger.
+          if (checkSecondarySlop(event, moveIndex)) {
+            final int oldPrimary = mPrimaryId;
+            mPrimaryId = mSecondaryId;
+            mSecondaryId = oldPrimary;
+            mPrimaryPastSlop = true;
+            mPrimaryX = mSecondaryX;
+            mPrimaryY = mSecondaryY;
+            mPrimaryLastX = mSecondaryX;
+            mPrimaryLastY = mSecondaryY;
+            mSecondaryX = -1;
+            mSecondaryY = -1;
+          }
+          // Let this fall through to process the event.
+        }
+        if (moveId == mPrimaryId) {
+          if (checkPrimarySlop(event, moveIndex)) {
+            mHandler.removeMessages(LONG_PRESS);
+            final int currentX = (int)event.getX(moveIndex);
+            final int currentY = (int)event.getY(moveIndex);
+            final int changeX = currentX - mPrimaryLastX;
+            final int changeY = currentY - mPrimaryLastY;
+            mPrimaryLastX = currentX;
+            mPrimaryLastY = currentY;
+            mEventQueue.add(new Event.MouseKegsEvent(changeX, changeY, mButton1, 1));
+            // Once we have had an active primary, don't allow promotions.
+            mSecondaryX = -1;
+            mSecondaryY = -1;
+          }
         }
-        return true;
       }
+      return true;  // ACTION_MOVE
     }
     return false;
   }