diff --git a/archlabs-installer b/archlabs-installer
index 7a5e474..21802db 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -1045,11 +1045,11 @@ part_mount()
 	mkdir -p "$mntpt"
 
 	if [[ $ignore -ne 2 && $fs && ${FS_OPTS[$fs]} && $part != "$BOOT" && $part != "$AUTO_ROOT" ]] && select_mntopts "$fs"; then
-		mount -o "$MNT_OPTS" "$part" "$mntpt" > /dev/null 2> "$ERR"
-		errshow 0 "mount -o '$MNT_OPTS' '$part' '$mntpt' > /dev/null" || return 1
+		mount -o $MNT_OPTS "$part" "$mntpt" > /dev/null 2> "$ERR" || mount -o $MNT_OPTS "$part" "$mntpt" > /dev/null 2> "$ERR"
+		errshow 0 "mount -o $MNT_OPTS $part $mntpt" || return 1
 	else
-		mount "$part" "$mntpt" > /dev/null 2> "$ERR"
-		errshow 0 "mount '$part' '$mntpt' > /dev/null" || return 1
+		mount "$part" "$mntpt" > /dev/null 2> "$ERR" || mount "$part" "$mntpt" > /dev/null 2> "$ERR"
+		errshow 0 "mount $part $mntpt" || return 1
 	fi
 
 	if grep -q "$mntpt" /proc/mounts; then
@@ -1105,11 +1105,19 @@ part_format()
 	local delay="$3"
 	shift 3
 
-	msg "File System Format" "\nFormatting $part as $fs\n" 0
-	mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" > /dev/null 2> "$ERR" ||
-		mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" > /dev/null 2> "$ERR"
+	if [[ $fs == 'f2fs' && -z $PF2FS ]]; then
+		modprobe f2fs
+		PF2FS=true
+		sleep 1
+	elif [[ $fs == 'btrfs' && -z $PBTRFS ]]; then
+		modprobe btrfs
+		PBTRFS=true
+		sleep 1
+	fi
 
-	errshow 0 "mkfs.$fs ${FS_CMD_FLAGS[$fs]} '$part'" || return 1
+	msg "File System Format" "\nFormatting $part as $fs\n" 0
+	mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" > /dev/null 2> "$ERR" || mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" > /dev/null 2> "$ERR"
+	errshow 0 "mkfs.$fs ${FS_CMD_FLAGS[$fs]} $part" || return 1
 	sleep "$delay"
 }
 
@@ -1496,18 +1504,15 @@ select_filesystem()
 
 		[[ $fs == 'skip' ]] && return 0
 		yesno "File System" "\nFormat $part as $fs?\n" || fs=''
-
-		if [[ $fs == 'f2fs' ]]; then
-			modprobe f2fs
-		elif [[ $fs == 'btrfs' ]]; then
-			modprobe btrfs
-			BTRFS=1
-			yesno "Btrfs Subvolumes" "$_btrfs" && BTRFS=2
-		fi
 	done
 
 	[[ $part == "$ROOT" ]] && ROOTFS=$fs
-	part_format "$part" "$fs" 0
+	part_format "$part" "$fs" 1
+
+	if [[ $fs == 'btrfs' ]]; then
+		BTRFS=1
+		yesno "Btrfs Subvolumes" "$_btrfs" && BTRFS=2
+	fi
 }
 
 select_mountpoint()
@@ -3111,8 +3116,8 @@ errshow()
 		[[ -r $DBG && $TERM == 'linux' ]] && less "$DBG"
 		die 1
 	fi
-	dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Install Error " \
-		--yesno "${txt}Errors at this stage may not be serious depending on the command and error type.\n$_errchoice\n" 0 0
+	dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Install Error " --yes-label "Abort" --no-label "Continue" \
+		--yesno "${txt}Errors at this stage may not be serious depending on the command and error type.\n$_errchoice\n" 0 0 || return 0
 
 	tput civis
 	return 1