diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 6b218a4f..389aaa60 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -28,11 +28,11 @@ import java.util.zip.ZipInputStream;
  * Install the Termux bootstrap packages if necessary by following the below steps:
  * <p/>
  * (1) If $PREFIX already exist, assume that it is correct and be done. Note that this relies on that we do not create a
- * broken $PREFIX folder below.
+ * broken $PREFIX directory below.
  * <p/>
  * (2) A progress dialog is shown with "Installing..." message and a spinner.
  * <p/>
- * (3) A staging folder, $STAGING_PREFIX, is {@link #deleteFolder(File)} if left over from broken installation below.
+ * (3) A staging directory, $STAGING_PREFIX, is {@link #deleteDirectory(File)} if left over from broken installation below.
  * <p/>
  * (4) The zip file is loaded from a shared library.
  * <p/>
@@ -49,16 +49,21 @@ final class TermuxInstaller {
 
     /** Performs setup if necessary. */
     static void setupIfNeeded(final Activity activity, final Runnable whenDone) {
+        Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
+
         // Termux can only be run as the primary user (device owner) since only that
         // account has the expected file system paths. Verify that:
         UserManager um = (UserManager) activity.getSystemService(Context.USER_SERVICE);
         boolean isPrimaryUser = um.getSerialNumberForUser(android.os.Process.myUserHandle()) == 0;
         if (!isPrimaryUser) {
-            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(R.string.bootstrap_error_not_primary_user_message)
+            String bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
+            Logger.logError(LOG_TAG, bootstrapErrorMessage);
+            new AlertDialog.Builder(activity).setTitle(R.string.bootstrap_error_title).setMessage(bootstrapErrorMessage)
                 .setOnDismissListener(dialog -> System.exit(0)).setPositiveButton(android.R.string.ok, null).show();
             return;
         }
 
+        Logger.logInfo(LOG_TAG, "Creating prefix directory \"" + TermuxConstants.TERMUX_PREFIX_DIR_PATH + "\".");
         final File PREFIX_FILE = TermuxConstants.TERMUX_PREFIX_DIR;
         if (PREFIX_FILE.isDirectory()) {
             whenDone.run();
@@ -74,9 +79,12 @@ final class TermuxInstaller {
                     final File STAGING_PREFIX_FILE = new File(STAGING_PREFIX_PATH);
 
                     if (STAGING_PREFIX_FILE.exists()) {
-                        deleteFolder(STAGING_PREFIX_FILE);
+                        Logger.logInfo(LOG_TAG, "Deleting prefix staging directory \"" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
+                        deleteDirectory(STAGING_PREFIX_FILE);
                     }
 
+                    Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TermuxConstants.TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
+
                     final byte[] buffer = new byte[8096];
                     final List<Pair<String, String>> symlinks = new ArrayList<>(50);
 
@@ -125,10 +133,13 @@ final class TermuxInstaller {
                         Os.symlink(symlink.first, symlink.second);
                     }
 
+                    Logger.logInfo(LOG_TAG, "Moving prefix staging to prefix directory.");
+
                     if (!STAGING_PREFIX_FILE.renameTo(PREFIX_FILE)) {
-                        throw new RuntimeException("Unable to rename staging folder");
+                        throw new RuntimeException("Moving prefix staging to prefix directory failed");
                     }
 
+                    Logger.logInfo(LOG_TAG, "Bootstrap packages installed successfully.");
                     activity.runOnUiThread(whenDone);
                 } catch (final Exception e) {
                     Logger.logStackTraceWithMessage(LOG_TAG, "Bootstrap error", e);
@@ -139,9 +150,9 @@ final class TermuxInstaller {
                                     dialog.dismiss();
                                     activity.finish();
                                 }).setPositiveButton(R.string.bootstrap_error_try_again, (dialog, which) -> {
-                                    dialog.dismiss();
-                                    TermuxInstaller.setupIfNeeded(activity, whenDone);
-                                }).show();
+                                dialog.dismiss();
+                                TermuxInstaller.setupIfNeeded(activity, whenDone);
+                            }).show();
                         } catch (WindowManager.BadTokenException e1) {
                             // Activity already dismissed - ignore.
                         }
@@ -173,14 +184,14 @@ final class TermuxInstaller {
 
     public static native byte[] getZip();
 
-    /** Delete a folder and all its content or throw. Don't follow symlinks. */
-    static void deleteFolder(File fileOrDirectory) throws IOException {
+    /** Delete a directory and all its content or throw. Don't follow symlinks. */
+    static void deleteDirectory(File fileOrDirectory) throws IOException {
         if (fileOrDirectory.getCanonicalPath().equals(fileOrDirectory.getAbsolutePath()) && fileOrDirectory.isDirectory()) {
             File[] children = fileOrDirectory.listFiles();
 
             if (children != null) {
                 for (File child : children) {
-                    deleteFolder(child);
+                    deleteDirectory(child);
                 }
             }
         }
@@ -192,6 +203,9 @@ final class TermuxInstaller {
 
     static void setupStorageSymlinks(final Context context) {
         final String LOG_TAG = "termux-storage";
+
+        Logger.logInfo(LOG_TAG, "Setting up storage symlinks.");
+
         new Thread() {
             public void run() {
                 try {
@@ -199,18 +213,20 @@ final class TermuxInstaller {
 
                     if (storageDir.exists()) {
                         try {
-                            deleteFolder(storageDir);
+                            deleteDirectory(storageDir);
                         } catch (IOException e) {
-                            Logger.logError(LOG_TAG, "Could not delete old $HOME/storage, " + e.getMessage());
+                            Logger.logStackTraceWithMessage(LOG_TAG, "Failed to delete old ~/storage directory", e);
                             return;
                         }
                     }
 
                     if (!storageDir.mkdirs()) {
-                        Logger.logError(LOG_TAG, "Unable to mkdirs() for $HOME/storage");
+                        Logger.logError(LOG_TAG, "Unable to create ~/storage directory.");
                         return;
                     }
 
+                    Logger.logInfo(LOG_TAG, "Setting up storage symlinks at ~/storage/shared, ~/storage/downloads, ~/storage/dcim, ~/storage/pictures, ~/storage/music and ~/storage/movies for directories in \"" + Environment.getExternalStorageDirectory().getAbsolutePath() + "\".");
+
                     File sharedDir = Environment.getExternalStorageDirectory();
                     Os.symlink(sharedDir.getAbsolutePath(), new File(storageDir, "shared").getAbsolutePath());
 
@@ -235,9 +251,12 @@ final class TermuxInstaller {
                             File dir = dirs[i];
                             if (dir == null) continue;
                             String symlinkName = "external-" + i;
+                            Logger.logInfo(LOG_TAG, "Setting up storage symlinks at ~/storage/" + symlinkName + " for \"" + dir.getAbsolutePath() + "\".");
                             Os.symlink(dir.getAbsolutePath(), new File(storageDir, symlinkName).getAbsolutePath());
                         }
                     }
+
+                    Logger.logInfo(LOG_TAG, "Storage symlinks created successfully.");
                 } catch (Exception e) {
                     Logger.logStackTraceWithMessage(LOG_TAG, "Error setting up link", e);
                 }
diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
index ba1e56dc..01feb005 100644
--- a/app/src/main/java/com/termux/app/TermuxService.java
+++ b/app/src/main/java/com/termux/app/TermuxService.java
@@ -151,7 +151,7 @@ public final class TermuxService extends Service {
 
         if (termuxTmpDir.exists()) {
             try {
-                TermuxInstaller.deleteFolder(termuxTmpDir.getCanonicalFile());
+                TermuxInstaller.deleteDirectory(termuxTmpDir.getCanonicalFile());
             } catch (Exception e) {
                 Logger.logStackTraceWithMessage(LOG_TAG, "Error while removing file at " + termuxTmpDir.getAbsolutePath(), e);
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4226e329..73793195 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,12 +28,12 @@
     <string name="toggle_keep_screen_on">Keep screen on</string>
     <string name="autofill_password">Autofill password</string>
 
-    <string name="bootstrap_installer_body">Installing…</string>
-    <string name="bootstrap_error_title">Unable to install</string>
+    <string name="bootstrap_installer_body">Installing bootstrap packages…</string>
+    <string name="bootstrap_error_title">Unable to install bootstrap</string>
     <string name="bootstrap_error_body">&TERMUX_APP_NAME; was unable to install the bootstrap packages.</string>
     <string name="bootstrap_error_abort">Abort</string>
     <string name="bootstrap_error_try_again">Try again</string>
-    <string name="bootstrap_error_not_primary_user_message">&TERMUX_APP_NAME; can only be installed on the primary user account.</string>
+    <string name="bootstrap_error_not_primary_user_message">&TERMUX_APP_NAME; can only be run as the primary user.\nBootstrap binaries compiled for &TERMUX_APP_NAME; have hardcoded $PREFIX path and cannot be installed under any path other than \"%1$s\".</string>
 
     <string name="max_terminals_reached_title">Max terminals reached</string>
     <string name="max_terminals_reached_message">Close down existing ones before creating new.</string>