diff --git a/README.md b/README.md
index 0aebee3..e5923ee 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ There are situations where the ability to switch between different versions of J
 useful. For example, if you want to test a project you're developing with the latest
 bleeding edge version without uninstalling the stable version of JDK, this utility can help.
 
-![Switch between stable and unstable versions.](http://coreybutler.github.io/nvm-windows/images/use.jpg)
+![Switch between stable and unstable versions.](dist/images/use.png)
 
 ### Installation & Upgrades
 
@@ -21,7 +21,7 @@ It comes with an installer (and uninstaller), because getting it should be easy.
 
 [Download the latest installer from the releases](https://github.com/ystyle/jvms/releases).
 
-![JVMS for Windows Installer](http://coreybutler.github.io/nvm-windows/images/installer.jpg)
+![JVMS for Windows Installer](dist/images/installer.png)
 
 **To upgrade**, run the new installer. It will safely overwrite the files it needs to update without touching your node.js installations.
 Make sure you use the same installation and symlink folder. If you originally installed to the default locations, you just need to click
diff --git a/dist/0.0.1/jvms-noinstall.zip b/dist/0.0.1/jvms-noinstall.zip
index d838680..d22a5ce 100644
Binary files a/dist/0.0.1/jvms-noinstall.zip and b/dist/0.0.1/jvms-noinstall.zip differ
diff --git a/dist/0.0.1/jvms-setup.zip b/dist/0.0.1/jvms-setup.zip
index 1946f7f..3a76f0c 100644
Binary files a/dist/0.0.1/jvms-setup.zip and b/dist/0.0.1/jvms-setup.zip differ
diff --git a/dist/images/installer.png b/dist/images/installer.png
new file mode 100644
index 0000000..405d519
Binary files /dev/null and b/dist/images/installer.png differ
diff --git a/dist/images/use.png b/dist/images/use.png
new file mode 100644
index 0000000..4d96fe2
Binary files /dev/null and b/dist/images/use.png differ
diff --git a/src/jvms.go b/src/jvms.go
index 9aa5132..9628cfd 100644
--- a/src/jvms.go
+++ b/src/jvms.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"./jvms/arch"
@@ -380,7 +379,6 @@ func list(listtype string) {
 		for i := 0; i < len(v); i++ {
 			version := v[i]
 			isnode, _ := regexp.MatchString("v", version)
-
 			str := ""
 			if isnode {
 				if "v"+inuse == version {
@@ -514,7 +512,7 @@ func Setup() {
 		} else if strings.Contains(line, "arch:") {
 			env.arch = strings.Trim(regexp.MustCompile("arch:").ReplaceAllString(line, ""), " \r\n")
 		} else if strings.Contains(line, "currentVersion:") {
-			env.arch = strings.Trim(regexp.MustCompile("currentVersion:").ReplaceAllString(line, ""), " \r\n")
+			env.currentVersion = strings.Trim(regexp.MustCompile("currentVersion:").ReplaceAllString(line, ""), " \r\n")
 		} else if strings.Contains(line, "proxy:") {
 			env.proxy = strings.Trim(regexp.MustCompile("proxy:").ReplaceAllString(line, ""), " \r\n")
 			if env.proxy != "none" && env.proxy != "" {