diff --git a/maloja/controller.py b/maloja/controller.py
index 199f7b8..af49ea0 100755
--- a/maloja/controller.py
+++ b/maloja/controller.py
@@ -17,7 +17,6 @@ from .backup import backup
 
 
 
-origpath = os.getcwd()
 
 def copy_initial_local_files():
 	folder = pkg_resources.resource_filename(__name__,"data_files")
@@ -106,8 +105,8 @@ def start():
 	setup()
 	try:
 		with open(datadir("logs/stderr.log"),"w") as logf:
-			p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=logf,cwd=DATA_DIR)
-			sp = subprocess.Popen(["python3","-m","maloja.supervisor"],stdout=subprocess.DEVNULL,stderr=logf,cwd=DATA_DIR)
+			p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=logf)
+			sp = subprocess.Popen(["python3","-m","maloja.supervisor"],stdout=subprocess.DEVNULL,stderr=logf)
 		print(col["green"]("Maloja started!") + " PID: " + str(p.pid))
 
 		from doreah import settings
@@ -164,7 +163,7 @@ def direct():
 	from . import server
 
 def backuphere():
-	backup(folder=origpath)
+	backup(folder=os.getcwd())
 
 def update():
 	os.system("pip3 install malojaserver --upgrade --no-cache-dir")
diff --git a/maloja/data_files/settings/default.ini b/maloja/data_files/settings/default.ini
index 1bdd7ff..00a6774 100644
--- a/maloja/data_files/settings/default.ini
+++ b/maloja/data_files/settings/default.ini
@@ -27,7 +27,8 @@ TRACK_SEARCH_PROVIDER = None
 
 DB_CACHE_SIZE = 8192		# how many MB on disk each database cache should have available.
 INVALID_ARTISTS = ["[Unknown Artist]","Unknown Artist","Spotify"]
-REMOVE_FROM_TITLE = ["(Original Mix)","(Radio Edit)","(Album Version)"]
+REMOVE_FROM_TITLE = ["(Original Mix)","(Radio Edit)","(Album Version)","(Explicit Version)"]
+USE_PARSE_PLUGINS = no
 
 [Local Images]
 
diff --git a/maloja/server.py b/maloja/server.py
index fd634ef..ae6ef3a 100755
--- a/maloja/server.py
+++ b/maloja/server.py
@@ -49,7 +49,7 @@ BaseRequest.MEMFILE_MAX = 15 * 1024 * 1024
 
 WEBFOLDER = pkg_resources.resource_filename(__name__,"web")
 STATICFOLDER = pkg_resources.resource_filename(__name__,"static")
-DATAFOLDER = DATADIR
+DATAFOLDER = DATA_DIR
 
 webserver = Bottle()