diff --git a/config.h b/config.h
index 8dd1c4e..ee1925b 100644
--- a/config.h
+++ b/config.h
@@ -21,12 +21,12 @@ static const mimetype mimetype_default_cmd[] = {
 	* file --mime-type -b ./image.gif
 	* gives us "image/gif", thusly if we want to open gif in mpv rather than feh,
 	* we need to define "gif" before "image" */
-	{ "text",	"$EDITOR"			},
-	{ "gif",	"mpv --loop-file=\"inf\""	},
-	{ "image",	"feh % &"			},
-	{ "video",	"mpv % &"			},
-	{ "audio",	"mpv"				},
-	{ "pdf",	"zathura"			},
+	{ "text",	"$EDITOR"						},
+	{ "gif",	"nohup mpv --loop-file=\"inf\" % >/dev/null 2>&1 &"	},
+	{ "image",	"feh % >/dev/null 2>&1 &"				},
+	{ "video",	"nohup mpv % >/dev/null 2>&1 &"				},
+	{ "audio",	"mpv"							},
+	{ "pdf",	"zathura"						},
 };
 static const extension file_extension_default_cmd[] = {
 	/* extension	shell command
diff --git a/dir.c b/dir.c
index f07920c..b60ed6f 100644
--- a/dir.c
+++ b/dir.c
@@ -139,18 +139,13 @@ void get_dir_content(char *path, unsigned long *dir_file_count, file *dir_conten
 			}
 			free(full_path);
 			free(file);
+			free(entry[i]);
 		}
 	}
 
 	qsort(dir_content, *dir_file_count, sizeof(file), order_func);
 	
-	for (i = 0; i < *dir_file_count; i++) {
-		free(entry[i]);
-	}
-	if (entry != NULL) {
-		free(entry);
-	} else {
-	}
+	free(entry);
 
 }
 
diff --git a/sorting.c b/sorting.c
index 34017d7..a7fd2d4 100644
--- a/sorting.c
+++ b/sorting.c
@@ -118,19 +118,13 @@ int sort_random(const void *file0, const void *file1){
 	if (!(((file*)file0)->file_type & FILE_TYPE_DIR) && (((file*)file1)->file_type & FILE_TYPE_DIR)) {
 			return 1;
 	}
-	time_t num = (time_t)&seed;
-	time_t i;
-	for (i = num%2; i < 6+(((time_t)&seed)%2); i++){
-		num ^= *seed;
-		if (num%2) {
-			num ^= (time_t)&num;
-			num ^= num << (i + (((time_t)&seed)%5));
-		} else {
-			num ^= (time_t)&seed;
-			num ^= num >> (i + (((time_t)&num)%5));
-		}
+	time_t num = ((time_t)&sort_random)^((time_t)sort_natural);
+	int i = 1;
+	for (; i < 6; i++) {
+		num += *seed;
+		num ^= num << ((((time_t)&seed)%6)+i);
+		num ^= num >> ((((time_t)&num)%9)+i);
 	}
-	num ^= getpid();
 
 	return ((num%3) - 1);