diff --git a/Dockerfile b/Dockerfile
index d52efde..99e172b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ RUN mkdir /beets
 VOLUME /beets
 ENV BEETSDIR=/beets
 
-COPY ./config.yaml ./
+RUN apt-get update && apt-get install -y --no-install-recommends vim
+ENV EDITOR=vim
 
 ENTRYPOINT ["/usr/local/bin/beet"]
diff --git a/Makefile b/Makefile
index e09da9a..b721445 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,11 @@
-DOCKER_TAG := beets-dev-${USER}
-SOURCE_DIR := ~/Music/Incoming
-TARGET_DIR := ~/Music/Library
+DOCKER_TAG ?= beets-dev
+SOURCE_DIR ?= ~/Music/Incoming
+TARGET_DIR ?= ~/Music/Library
 BEET_CMD := BEETSDIR=. ./beets_env/bin/beet -d $(TARGET_DIR)
 
+test:
+	echo $(SOURCE_DIR)
+
 default: beets_env
 
 # Creates virtualenv with beets
@@ -41,7 +44,7 @@ docker-import: docker-build
 		-v $(TARGET_DIR):/library \
 		$(DOCKER_TAG) \
 		-d /library \
-		import -i -c /import
+		import -i /import
 
 docker-duplicates: docker-build
 	docker run --rm -it \
diff --git a/config.yaml b/config.yaml
index 8cb6f69..72a5bdd 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,9 +1,9 @@
 # Currently specified on the commandline
 # directory: ~/Music/Music
 
-# musicbrainz:
-#   host: localhost:5000
-#   ratelimit: 100
+#musicbrainz:
+#  host: musicbrainz:5000
+#  ratelimit: 100
 
 import:
   move: yes
@@ -32,6 +32,7 @@ plugins:
   - web
   - duplicates
   - play
+  - edit
 
 fetchart:
   cautious: yes
diff --git a/import.sh b/import.sh
new file mode 100755
index 0000000..855816f
--- /dev/null
+++ b/import.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+export SOURCE_DIR=/share/Multimedia/Music_Import 
+export TARGET_DIR=/share/Multimedia/Music_Clean 
+make docker-import