diff --git a/atom b/atom
index 5c35308..a3f86b7 100755
--- a/atom
+++ b/atom
@@ -616,7 +616,7 @@ do
 	rest=${line#*::AtOM:SQL:Sep::}
 	filename=${rest%%::AtOM:SQL:Sep::*}
 	oldfilename=${rest#*::AtOM:SQL:Sep::}
-	if [[ $oldfilename != $filename ]] && [ -f "$oldfilename" ]
+	if [[ $oldfilename != "$filename" ]] && [ -f "$oldfilename" ]
 	then
 		rm -f "$oldfilename"
 	fi
diff --git a/lib/encode/encodeFile::mp3 b/lib/encode/encodeFile::mp3
index c958f2a..1496570 100644
--- a/lib/encode/encodeFile::mp3
+++ b/lib/encode/encodeFile::mp3
@@ -51,7 +51,12 @@ encodeFile::mp3() {
 			$(
 				for key in ${!lameopts[@]}
 				do
-					echo "cmd_arg$key ${lameopts[key]}"
+					cleanedopts="${lameopts[key]//\&/\\\&}"
+					cleanedopts="${cleanedopts//\[/\\[}"
+					cleanedopts="${cleanedopts//\]/\\]}"
+					cleanedopts="${cleanedopts//\{/\\{}"
+					cleanedopts="${cleanedopts//\}/\\\}}"
+					echo "cmd_arg$key $cleanedopts"
 				done
 			)
 			cleanup		$tempdir/$tmpfile.wav
diff --git a/lib/encode/encodeFile::opus b/lib/encode/encodeFile::opus
index 2794a05..8e9bbcd 100644
--- a/lib/encode/encodeFile::opus
+++ b/lib/encode/encodeFile::opus
@@ -26,7 +26,12 @@ encodeFile::opus() {
 			$(
 				for key in ${!opusencopts[@]}
 				do
-					echo "cmd_arg$key ${opusencopts[key]}"
+					cleanedopts="${opusencopts[key]//\&/\\\&}"
+					cleanedopts="${cleanedopts//\[/\\[}"
+					cleanedopts="${cleanedopts//\]/\\]}"
+					cleanedopts="${cleanedopts//\{/\\{}"
+					cleanedopts="${cleanedopts//\}/\\\}}"
+					echo "cmd_arg$key $cleanedopts"
 				done
 			)
 			cleanup		$tempdir/$tmpfile.wav
diff --git a/lib/encode/encodeFile::vorbis b/lib/encode/encodeFile::vorbis
index c3a72e3..7c32538 100644
--- a/lib/encode/encodeFile::vorbis
+++ b/lib/encode/encodeFile::vorbis
@@ -22,6 +22,11 @@ encodeFile::vorbis() {
 			$(
 				for key in ${!oggencopts[@]}
 				do
+					cleanedopts="${oggencopts[key]//\&/\\\&}"
+					cleanedopts="${cleanedopts//\[/\\[}"
+					cleanedopts="${cleanedopts//\]/\\]}"
+					cleanedopts="${cleanedopts//\{/\\{}"
+					cleanedopts="${cleanedopts//\}/\\\}}"
 					echo "cmd_arg$key ${oggencopts[key]}"
 				done
 			)
diff --git a/lib/files/sanitizeFile b/lib/files/sanitizeFile
index 2968f5e..07e8e50 100644
--- a/lib/files/sanitizeFile
+++ b/lib/files/sanitizeFile
@@ -27,12 +27,5 @@ sanitizeFile() {
 			string=${string/%+(.)/}
 		fi
 	fi
-	# Not exactly filename sanitity, but these will make the script fail in
-	# a decorative way..
-	string="${string//&/\\&}"
-	strint="${string//;/\\;}"
-	# And these would exhibit strange behaviors
-	string="${string//\[/\\\[}"
-	string="${string//\]/\\\]}"
 	echo "$string"
 }