diff --git a/electron/commands/batch-upscayl.ts b/electron/commands/batch-upscayl.ts
index 04ee8da..ee2c94f 100644
--- a/electron/commands/batch-upscayl.ts
+++ b/electron/commands/batch-upscayl.ts
@@ -47,7 +47,7 @@ const batchUpscayl = async (event, payload) => {
     scale = "4";
   }
 
-  outputDir += `_${model}_x${payload.scale}`;
+  outputDir += slash + `upscayl_${model}_x${payload.scale}`;
   if (!fs.existsSync(outputDir)) {
     fs.mkdirSync(outputDir, { recursive: true });
   }
diff --git a/renderer/components/settings-tab/index.tsx b/renderer/components/settings-tab/index.tsx
index 9208277..72594c3 100644
--- a/renderer/components/settings-tab/index.tsx
+++ b/renderer/components/settings-tab/index.tsx
@@ -98,9 +98,18 @@ function SettingsTab({
       localStorage.setItem("model", JSON.stringify(modelOptions[0]));
       logit("🔀 Setting model to", modelOptions[0].value);
     } else {
-      const currentlySavedModel = JSON.parse(
+      let currentlySavedModel = JSON.parse(
         localStorage.getItem("model")
       ) as (typeof modelOptions)[0];
+      if (
+        modelOptions.find(
+          (model) => model.value === currentlySavedModel.value
+        ) === undefined
+      ) {
+        localStorage.setItem("model", JSON.stringify(modelOptions[0]));
+        logit("🔀 Setting model to", modelOptions[0].value);
+        currentlySavedModel = modelOptions[0];
+      }
       setCurrentModel(currentlySavedModel);
       setModel(currentlySavedModel.value);
       logit(
diff --git a/renderer/components/upscayl-tab/view/ProgressBar.tsx b/renderer/components/upscayl-tab/view/ProgressBar.tsx
index 906adaa..593f550 100644
--- a/renderer/components/upscayl-tab/view/ProgressBar.tsx
+++ b/renderer/components/upscayl-tab/view/ProgressBar.tsx
@@ -10,7 +10,9 @@ function ProgressBar({
   const [batchProgress, setBatchProgress] = React.useState(0);
 
   React.useEffect(() => {
-    if (progress.includes("0.00%")) {
+    const progressString = progress.replace(/\n/g, "");
+    console.log({ progressString });
+    if (progressString.length === 5 && progressString === "0.00%") {
       setBatchProgress((prev) => prev + 1);
     }
   }, [progress]);
diff --git a/renderer/pages/index.tsx b/renderer/pages/index.tsx
index 26254b2..10cb6aa 100644
--- a/renderer/pages/index.tsx
+++ b/renderer/pages/index.tsx
@@ -293,7 +293,7 @@ const Home = () => {
     if (path !== null) {
       logit("🖼 Selected Folder Path: ", path);
       setBatchFolderPath(path);
-      setOutputPath(path + "_upscayled");
+      setOutputPath(path);
     } else {
       logit("🚫 Folder selection cancelled");
       setBatchFolderPath("");