diff --git a/setup.sh b/setup.sh
index 22e3754b0df3d9d204d11645f86c16426ab803a6..50bab68fff36a3667f4631485080549a47bd45fa 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,11 +1,6 @@
 #!/bin/sh
 
 # ToDo:
-#	- Fix systemctl
-#	- DE for VNC maybe RPD?
-#	- Check VNC of pi? users
-#	- Check VNC if headless
-#	- Adjust VNC to liking
 #	- get new PiCam	
 #	- Setup Camera
 #	- Fix mjpeg-streamer
@@ -42,9 +37,9 @@
 	echo "Creating VNC Users"
 	for i in $(seq 1 $vncCount)
 	do
-		echo " Creating pi$i"
-		sudo adduser --gecos --quiet --disabled-login --disabled-password pi$i > /dev/null
-		sudo usermod -a -G i2c,dialout pi$i
+		echo " Creating $vncBaseName$i"
+		sudo adduser --gecos --quiet --disabled-login --disabled-password $vncBaseName$i > /dev/null
+		sudo usermod -a -G i2c,dialout $vncBaseName$i
 		
 		# VNC Password:
 		myuser=$vncBaseName$i
@@ -141,14 +136,14 @@
 	#desktops
 	for i in $(seq 1 $vncCount)
 	do
-		sudo mkdir -p /home/pi$i/Desktop/
-		sudo cp desktop-shortcuts/arduinocontrol.desktop /home/pi$i/Desktop/
+		sudo mkdir -p /home/$vncBaseName$i/Desktop/
+		sudo cp desktop-shortcuts/arduinocontrol.desktop /home/$vncBaseName$i/Desktop/
 	done
 	
 	echo "Creating desktop shortcuts for Arduino IDE."
 	for i in $(seq 1 $vncCount)
 	do
-		sudo cp /usr/share/applications/arduino.desktop /home/pi$i/Desktop/
+		sudo cp /usr/share/applications/arduino.desktop /home/$vncBaseName$i/Desktop/
 	done
 
 	echo "Adding example Sketch."