diff --git a/onos-build-vm.py b/onos-build-vm.py
index 62bb7e6..75dc322 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -24,7 +24,7 @@
     # start with sendline
     #TODO consider resizing the HDD
     url = 'https://gerrit.onlab.us/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/mininet-tutorial;f=vm-setup.sh'
-    vm.sendline( 'wget -O vm-setup.sh "%s" | bash' % url )
+    vm.sendline( ' wget -O vm-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
     vm.expect( prompt, timeout=20 )
     vm.sendline( 'bash vm-setup.sh' )
     # end with expect prompt
diff --git a/vm-setup.sh b/vm-setup.sh
index 60767a9..3024f81 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -3,8 +3,8 @@
 #  
 # This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
 
-ONOS_USER=mininet
-ONOS_USER_HOME=/home/${ONOS_USER}
+USER=mininet
+USER_HOME=/home/${USER}
 
 sudo apt-get update
 
@@ -44,25 +44,28 @@
 
 #TODO: add backgrounds folder
 #TODO: change background
-# Remove wallpaper, change background color, and disable screensaver
+# Remove wallpaper, change background color
 sudo sed -i 's/wallpaper_mode=1/wallpaper_mode=0/g' /usr/share/lxde/pcmanfm/LXDE.conf
 sudo sed -i 's/desktop_bg=#000000/desktop_bg=#104187/g' /usr/share/lxde/pcmanfm/LXDE.conf
-sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
 
-DESKTOP=${ONOS_USER_HOME}/Desktop
+# Disable screensaver
+##sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
+cat > ${USER_HOME}/.xsessionrc << EOF
+# disable screensaver
+xset s off
+# disable dpms (standby)
+xset -dpms
+EOF
+
+# Change LXTerminal default colors
+sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
+sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
+
+DESKTOP=${USER_HOME}/Desktop
+OFFLINE="${DESKTOP}/Offline Exercises"
 
 mkdir -p ${DESKTOP}
-
-#cat > ${DESKTOP}/Eclipse << EOF
-#[Desktop Entry]
-#Encoding=UTF-8
-#Type=Application
-#Name=Eclipse
-#Name[en_US]=Eclipse
-#Icon=/opt/eclipse/icon.xpm
-#Exec=/usr/bin/eclipse
-#Comment[en_US]=
-#EOF
+mkdir -p "${OFFLINE}"
 
 cat > ${DESKTOP}/Terminal << EOF
 [Desktop Entry]
@@ -75,14 +78,14 @@
 Comment[en_US]=
 EOF
 
-cat > ${DESKTOP}/Bufferbloat << EOF
+cat > ${DESKTOP}/Mininet << EOF
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=Bufferbloat (Offline)
-Name[en_US]=Bufferbloat
+Name=Teaching with Mininet
+Name[en_US]=Teaching with Mininet
 Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/Bufferbloat.html
+Exec=/usr/bin/chromium-browser http://teaching.mininet.org
 Comment[en_US]=
 EOF
 
@@ -97,6 +100,17 @@
 Comment[en_US]=
 EOF
 
+cat > "${OFFLINE}/Bufferbloat" << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Bufferbloat
+Name[en_US]=Bufferbloat
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/Bufferbloat.html
+Comment[en_US]=
+EOF
+
 # ------------- Install Other Tools ------------- 
 sudo apt-get install -y wireshark
 # Enable root-less wireshark and add mininet
@@ -105,9 +119,14 @@
 sudo dpkg-reconfigure -f noninteractive wireshark-common
 sudo usermod -a -G wireshark mininet
 
+echo "Installing VirtualBox Guest Additions"
+sudo apt-get install -y virtualbox-guest-x11
+
 # ------------- Zero Unused Blocks -------------
 #TODO investigate zerofree
 echo "Zeroing unused blocks"
+sync
 dd if=/dev/zero of=tmp-zeros
 sync
 rm tmp-zeros
+sync