diff --git a/Dockerfile b/Dockerfile
index 7f70556..132ad58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # NAME leenooks/mysticbbs
 # VERSION 1.12a39-armv7l
 
-FROM arm32v7/debian:jessie-slim
+FROM arm32v7/debian:stretch-slim
 
 MAINTAINER Deon George <deon@leenooks.net>
 
diff --git a/README.md b/README.md
index 43c1742..aaa0c1d 100644
--- a/README.md
+++ b/README.md
@@ -64,4 +64,4 @@ You can also run this in a swarm (I do)!
 
 ----
 ## Extras Container
-There is an "extras" container with some additional MysticBBS mods pre-installed. You'll find info on that in the [armv7l-extras](https://dev.leenooks.net/leenooks/mysticbbs/blob/armv7l-extras/README.md) branch.
+There is an "extras" container with some additional MysticBBS mods pre-installed. You'll find info on that in the [armv7l-extras](https://dev.leenooks.net/leenooks/mysticbbs/blob/armv7l-extras/README.md#info-on-the-images) branch.
diff --git a/cleaninstall/cleaninstall.sh b/cleaninstall/cleaninstall.sh
index d72289e..e69e017 100755
--- a/cleaninstall/cleaninstall.sh
+++ b/cleaninstall/cleaninstall.sh
@@ -15,7 +15,7 @@ PATCH_FILE=mystic.112a39.patch
 [ $(id -u) -ne 0 ] && echo "ERROR: You need to run me as root." && exit 1
 
 if [ -d ${TARGET_DIR} ]; then
-	echo "! Skipping installation [$TARGET_DIR} already exists"
+	echo "! Skipping installation [${TARGET_DIR}] already exists"
 
 else
 	# 1) Download Mystic App
@@ -74,5 +74,5 @@ echo "Zipping up data dir..."
 tar czf mystic/data.tar.gz data/
 
 # That dir is now ready for the image
-tar czf mystic.tar.gz mystic
+tar czf ../mystic.tar.gz mystic
 echo "OK mystic.tar.gz can be moved to your docker build"
diff --git a/mystic.tar.gz b/mystic.tar.gz
index 25bd950..0ce1ea7 100644
Binary files a/mystic.tar.gz and b/mystic.tar.gz differ