diff --git a/public/break_escape/js/core/game.js b/public/break_escape/js/core/game.js
index fe707ea..c4b4b1c 100644
--- a/public/break_escape/js/core/game.js
+++ b/public/break_escape/js/core/game.js
@@ -832,6 +832,45 @@ export async function create() {
         const worldX = this.cameras.main.scrollX + pointer.x;
         const worldY = this.cameras.main.scrollY + pointer.y;
         
+        // Check interaction mode - if in punch mode (jab or cross), just punch in the direction of click
+        if (window.playerCombat) {
+            const currentMode = window.playerCombat.getInteractionMode();
+            if (currentMode === 'jab' || currentMode === 'cross') {
+                // Calculate direction from player to click point
+                const player = window.player;
+                if (player) {
+                    const dx = worldX - player.x;
+                    const dy = worldY - player.y;
+                    
+                    // Calculate direction using same logic as NPCs
+                    const absVX = Math.abs(dx);
+                    const absVY = Math.abs(dy);
+                    
+                    let direction;
+                    // Threshold: if one axis is > 2x the other, consider it pure cardinal
+                    if (absVX > absVY * 2) {
+                        direction = dx > 0 ? 'right' : 'left';
+                    } else if (absVY > absVX * 2) {
+                        direction = dy > 0 ? 'down' : 'up';
+                    } else {
+                        // Diagonal
+                        if (dy > 0) {
+                            direction = dx > 0 ? 'down-right' : 'down-left';
+                        } else {
+                            direction = dx > 0 ? 'up-right' : 'up-left';
+                        }
+                    }
+                    
+                    // Update player facing direction
+                    player.lastDirection = direction;
+                    
+                    // Trigger punch animation (don't move)
+                    window.playerCombat.punch();
+                }
+                return; // Exit early - no movement or interaction in punch modes
+            }
+        }
+        
         // Check for NPC sprites at the clicked position first
         const npcAtPosition = findNPCAtPosition(worldX, worldY);
         if (npcAtPosition) {
diff --git a/public/break_escape/js/core/player.js b/public/break_escape/js/core/player.js
index 68f26b5..c1dfca4 100644
--- a/public/break_escape/js/core/player.js
+++ b/public/break_escape/js/core/player.js
@@ -172,6 +172,18 @@ function setupKeyboardInput() {
         
         // E key for interaction
         if (key === 'e') {
+            // Check interaction mode - if in punch mode, just punch in current direction
+            if (window.playerCombat) {
+                const currentMode = window.playerCombat.getInteractionMode();
+                if (currentMode === 'jab' || currentMode === 'cross') {
+                    // Punch in current facing direction (don't interact)
+                    window.playerCombat.punch();
+                    event.preventDefault();
+                    return;
+                }
+            }
+            
+            // Normal interaction mode - interact with nearest object
             if (window.tryInteractWithNearest) {
                 window.tryInteractWithNearest();
             }
diff --git a/public/break_escape/js/main.js b/public/break_escape/js/main.js
index 6214ec8..772d4f1 100644
--- a/public/break_escape/js/main.js
+++ b/public/break_escape/js/main.js
@@ -81,6 +81,12 @@ function initializeGame() {
     // Create the Phaser game instance
     window.game = new Phaser.Game(config);
 
+    // Prevent default context menu on right-click
+    window.game.canvas.addEventListener('contextmenu', (e) => {
+        e.preventDefault();
+        return false;
+    });
+
     // Initialize all systems
     initializeNotifications();
     // Bluetooth scanner and biometrics are now handled as minigames
diff --git a/public/break_escape/js/minigames/lockpicking/key-selection.js b/public/break_escape/js/minigames/lockpicking/key-selection.js
index db4b8dd..97d5f91 100644
--- a/public/break_escape/js/minigames/lockpicking/key-selection.js
+++ b/public/break_escape/js/minigames/lockpicking/key-selection.js
@@ -146,6 +146,14 @@ export class KeySelection {
         // keys: array of key objects with id, cuts, and optional name properties
         // correctKeyId: ID of the correct key (if null, uses index 0 as fallback)
         // Shows 3 keys at a time with navigation buttons for more than 3 keys
+
+        // Resolve Phaser scene (may not be ready yet if key selection runs before scene create())
+        const scene = this.parent.scene || (this.parent.game && this.parent.game.scene && this.parent.game.scene.getScene('LockpickingScene'));
+        if (!scene) {
+            console.warn('Key selection: Phaser scene not ready, retrying in 50ms');
+            setTimeout(() => this.createKeySelectionUI(keys, correctKeyId), 50);
+            return;
+        }
         
         // Find the correct key index in the original array
         let correctKeyIndex = 0;
@@ -189,11 +197,11 @@ export class KeySelection {
         const containerHeight = keyHeight + labelHeight + spacing + padding + 10; // +50 for title
         
         // Create container for key selection - positioned in the middle but below pins
-        const keySelectionContainer = this.parent.scene.add.container(0, 230);
+        const keySelectionContainer = scene.add.container(0, 230);
         keySelectionContainer.setDepth(1000); // High z-index to appear above everything
         
         // Add background
-        const background = this.parent.scene.add.graphics();
+        const background = scene.add.graphics();
         background.fillStyle(0x000000, 0.8);
         background.fillRect(0, 0, containerWidth, containerHeight);
         background.lineStyle(2, 0xffffff);
@@ -202,7 +210,7 @@ export class KeySelection {
         
         // Add title
         const titleX = containerWidth / 2;
-        const title = this.parent.scene.add.text(titleX, 15, 'Select the correct key', {
+        const title = scene.add.text(titleX, 15, 'Select the correct key', {
             fontSize: '24px',
             fill: '#ffffff',
             fontFamily: 'VT323',
@@ -265,7 +273,7 @@ export class KeySelection {
                 
                 // Add key label (use name if available, otherwise use number)
                 const keyName = keyData.name || `Key ${actualIndex + 1}`;
-                const keyLabel = this.parent.scene.add.text(keyX + keyWidth/2, keyY + keyHeight + 5, keyName, {
+                const keyLabel = scene.add.text(keyX + keyWidth/2, keyY + keyHeight + 5, keyName, {
                     fontSize: '16px',
                     fill: '#ffffff',
                     fontFamily: 'VT323'
@@ -306,7 +314,7 @@ export class KeySelection {
             const keysAreaCenterY = 50 + (keyHeight + labelHeight) / 2;
             
             // Previous button (left side)
-            prevButton = this.parent.scene.add.graphics();
+            prevButton = scene.add.graphics();
             prevButton.fillStyle(0x444444);
             prevButton.fillRect(0, 0, buttonWidth, buttonHeight);
             prevButton.lineStyle(2, 0xffffff);
@@ -324,7 +332,7 @@ export class KeySelection {
             keySelectionContainer.add(prevButton);
             
             // Previous button text
-            prevText = this.parent.scene.add.text(padding / 2 + buttonWidth / 2, keysAreaCenterY, '‹', {
+            prevText = scene.add.text(padding / 2 + buttonWidth / 2, keysAreaCenterY, '‹', {
                 fontSize: '20px',
                 fill: '#ffffff',
                 fontFamily: 'VT323'
@@ -335,7 +343,7 @@ export class KeySelection {
             keySelectionContainer.add(prevText);
             
             // Next button (right side)
-            nextButton = this.parent.scene.add.graphics();
+            nextButton = scene.add.graphics();
             nextButton.fillStyle(0x444444);
             nextButton.fillRect(0, 0, buttonWidth, buttonHeight);
             nextButton.lineStyle(2, 0xffffff);
@@ -353,7 +361,7 @@ export class KeySelection {
             keySelectionContainer.add(nextButton);
             
             // Next button text
-            nextText = this.parent.scene.add.text(containerWidth - padding / 2 - buttonWidth / 2, keysAreaCenterY, '›', {
+            nextText = scene.add.text(containerWidth - padding / 2 - buttonWidth / 2, keysAreaCenterY, '›', {
                 fontSize: '20px',
                 fill: '#ffffff',
                 fontFamily: 'VT323'
@@ -364,7 +372,7 @@ export class KeySelection {
             keySelectionContainer.add(nextText);
             
             // Page indicator - centered below all keys
-            pageIndicator = this.parent.scene.add.text(containerWidth / 2, containerHeight - 20, `1/${totalPages}`, {
+            pageIndicator = scene.add.text(containerWidth / 2, containerHeight - 20, `1/${totalPages}`, {
                 fontSize: '12px',
                 fill: '#888888',
                 fontFamily: 'VT323'