diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6184c00b..fc4459c3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,7 +25,7 @@ android {
         externalNativeBuild {
             cmake {
                  arguments "-DSDL_SHARED=ON", "-DANDROID_STL=c++_static", "-DHAVE_LD_VERSION_SCRIPT=OFF",'-DUSE_OPENGLES=ON'
-                 abiFilters 'armeabi-v7a', 'arm64-v8a'
+                 abiFilters 'arm64-v8a'
             }
         }
     }
diff --git a/android/app/src/main/java/com/starship/android/DialogActivity.java b/android/app/src/main/java/com/starship/android/DialogActivity.java
index eae1ef79..dc7f3813 100644
--- a/android/app/src/main/java/com/starship/android/DialogActivity.java
+++ b/android/app/src/main/java/com/starship/android/DialogActivity.java
@@ -53,10 +53,12 @@ public class DialogActivity extends Activity {
                 
             case DIALOG_TYPE_FILE_NOT_FOUND:
                 builder.setPositiveButton("Download Torch App", (d, w) -> {
+                    android.util.Log.i("DialogActivity", "Torch download button pressed");
                     setResult(RESULT_TORCH_DOWNLOAD);
                     finish();
                 });
                 builder.setNegativeButton("Select sf64.o2r File", (d, w) -> {
+                    android.util.Log.i("DialogActivity", "File picker button pressed");
                     setResult(RESULT_FILE_PICKER);
                     finish();
                 });
diff --git a/android/app/src/main/java/com/starship/android/MainActivity.java b/android/app/src/main/java/com/starship/android/MainActivity.java
index 8ad5d9b3..c31031d6 100644
--- a/android/app/src/main/java/com/starship/android/MainActivity.java
+++ b/android/app/src/main/java/com/starship/android/MainActivity.java
@@ -221,7 +221,16 @@ protected void onCreate(Bundle savedInstanceState) {
     // Now check if sf64.o2r exists in internal storage
     if (!internalSf64.exists()) {
         Log.i(TAG, "sf64.o2r not found. Prompting for folder.");
-        promptForUserFolder();
+        if (userFolderUri == null) {
+            // First time - need to select folder
+            promptForUserFolder();
+        } else {
+            // Folder already selected but no ROM - show file not found dialog
+            showPortraitDialog("sf64.o2r not found in selected folder",
+                "Pick an existing sf64.o2r file or use Torch to create one. It will be copied to your selected folder.",
+                DialogActivity.DIALOG_TYPE_FILE_NOT_FOUND);
+        }
+        // Don't count down the latch yet - wait for user to provide ROM
     } else {
         Log.i(TAG, "sf64.o2r found in internal storage, game should start normally.");
         setupLatch.countDown();
@@ -395,7 +404,7 @@ public void openFilePickerForSf64() {
 
 private void openTorchDownload() {
     try {
-        Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/HarbourMasters/Torch/releases"));
+        Intent browser = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/izzy2lost/Torch/releases"));
         Intent chooser = Intent.createChooser(browser, "Open Torch download page with:");
         chooser.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(chooser);
@@ -408,7 +417,7 @@ private void openTorchDownload() {
         }, 2000);
     } catch (Exception e) {
         Log.e(TAG, "openTorchDownload", e);
-        showToast("Visit: https://github.com/HarbourMasters/Torch/releases");
+        showToast("Visit: https://github.com/izzy2lost/Torch/releases");
     }
 }
 
@@ -417,15 +426,20 @@ private void openTorchDownload() {
 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
 
+    Log.i(TAG, "onActivityResult: requestCode=" + requestCode + ", resultCode=" + resultCode);
+
     // Handle DialogActivity results
     if (requestCode == DialogActivity.DIALOG_TYPE_FOLDER_PROMPT && resultCode == DialogActivity.RESULT_FOLDER_PICKER) {
+        Log.i(TAG, "Opening folder picker");
         openFolderPicker();
         return;
     }
     if (requestCode == DialogActivity.DIALOG_TYPE_FILE_NOT_FOUND) {
         if (resultCode == DialogActivity.RESULT_TORCH_DOWNLOAD) {
+            Log.i(TAG, "Opening Torch download");
             openTorchDownload();
         } else if (resultCode == DialogActivity.RESULT_FILE_PICKER) {
+            Log.i(TAG, "Opening file picker for sf64");
             openFilePickerForSf64();
         }
         return;