diff --git a/src/com/limelight/Game.java b/src/com/limelight/Game.java
index b46cac8d..16aa7501 100644
--- a/src/com/limelight/Game.java
+++ b/src/com/limelight/Game.java
@@ -58,12 +58,20 @@ public class Game extends Activity {
 		conn.start();
 	}
 	
+	@Override
+	public void onPause() {
+		super.onPause();
+		
+		System.exit(0);
+	}
+	
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		
 		switch (keyCode) {
 		case OuyaController.BUTTON_MENU:
-			inputMap |= NvInputPacket.PLAY_FLAG;
+			System.out.println("Menu Pressed");
+			inputMap |= NvInputPacket.BACK_FLAG;
 			break;
 		case OuyaController.BUTTON_DPAD_LEFT:
 			inputMap |= NvInputPacket.LEFT_FLAG;
@@ -112,7 +120,7 @@ public class Game extends Activity {
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
 		switch (keyCode) {
 		case OuyaController.BUTTON_MENU:
-			inputMap &= ~NvInputPacket.PLAY_FLAG;
+			inputMap &= ~NvInputPacket.BACK_FLAG;
 			break;
 		case OuyaController.BUTTON_DPAD_LEFT:
 			inputMap &= ~NvInputPacket.LEFT_FLAG;
diff --git a/src/com/limelight/nvstream/input/NvInputPacket.java b/src/com/limelight/nvstream/input/NvInputPacket.java
index d1d942de..4168ddbf 100644
--- a/src/com/limelight/nvstream/input/NvInputPacket.java
+++ b/src/com/limelight/nvstream/input/NvInputPacket.java
@@ -36,12 +36,12 @@ public class NvInputPacket {
 		public static final short DOWN_FLAG = 0x0002;
 		public static final short LEFT_FLAG = 0x0004;
 		public static final short RIGHT_FLAG = 0x0008;
-		public static final short RB_FLAG = 0x0100;
-		public static final short LB_FLAG = 0x0200;
-		public static final short LS_CLK_FLAG = 0x0004;
-		public static final short RS_CLK_FLAG = 0x0008;
-		public static final short PLAY_FLAG = 0x0001;
-		public static final short BACK_FLAG = 0x0002;
+		public static final short LB_FLAG = 0x0100;
+		public static final short RB_FLAG = 0x0200;
+		public static final short PLAY_FLAG = 0x0010;
+		public static final short BACK_FLAG = 0x0020;
+		public static final short LS_CLK_FLAG = 0x0040;
+		public static final short RS_CLK_FLAG = 0x0080;
 		
 		public static final short PACKET_LENGTH = 28;