diff --git a/config/lxpanel/LXDE/panels/panel b/config/lxpanel/LXDE/panels/panel
index 1f9b40761ae79734ab138d4ff90fcc8bfde7956c..f77b5cdd70e3d5da7d6356bd2dab3533a455bcba 100644
--- a/config/lxpanel/LXDE/panels/panel
+++ b/config/lxpanel/LXDE/panels/panel
@@ -41,7 +41,7 @@ Plugin {
       id=pcmanfm.desktop
     }
     Button {
-      id=lxde-x-www-browser.desktop
+      id=lxterminal.desktop
     }
     Button {
       id=arduinocontrol.desktop
diff --git a/setup.sh b/setup.sh
index d32a04b1bf6bf4149418d98837b814007c272b33..e38bad64968a05428dd31676136525e4c9a9bdd7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -52,7 +52,8 @@
 		echo " VNC Password: $mypasswd"
 		echo "  copying configuration files"
 		sudo cp vnc/xstartup /home/$myuser/.vnc/xstartup
-		sudo cp -r config/ /home/$myuser/.config
+		sudo chmod +x /home/$myuser/.vnc/xstartup
+		sudo cp -r config/* /home/$myuser/.config/
 	done
 
 
@@ -62,7 +63,11 @@
 	sudo apt -qq install -qq -y tightvncserver
 
 	echo " Checking for autostart service."
-	VNC=$(systemctl status vncserver$vncCount)
+	VNC=""
+	for i in $(seq 1 $vncCount)
+	do
+		VNC=$VNC$(systemctl status vncserver$i)
+	done
 
 	if [ -z "$VNC" \
 		 -o -n "$(echo $VNC | grep "not found")" \
@@ -72,7 +77,7 @@
 		
 		for i in $(seq 1 $vncCount)
 		do
-			cat vnc-config/vncserver.service | \
+			cat vnc/vncserver.service | \
 			sed -e "s/USER/$vncBaseName$i/"  | \
 			sed -e "s/NUM/$i/"               > vncserver$i.service