diff --git a/onos-build-vm.py b/onos-build-vm.py
index 041a86f..3dc44b2 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -45,6 +45,7 @@
     vm.sendline('ssh 127.0.0.1')
     vm.expect('.*connecting (yes/no)?')
     vm.sendline('yes')
+    vm.expect(prompt, timeout=30)
     vm.sendline('exit')
     
     vm.expect( prompt, timeout=1200 )
@@ -53,7 +54,7 @@
     vm.sendline( ' wget -O onos-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
     vm.expect( prompt, timeout=20 )
     vm.sendline( 'bash onos-setup.sh' )
-    vm.expect(prompt, timeout=20)
+    vm.expect(prompt, timeout=600)
   
 
 def vmdk2size( vmdk ):
diff --git a/tutorial1-setup.sh b/tutorial1-setup.sh
index 91233b0..719a02e 100644
--- a/tutorial1-setup.sh
+++ b/tutorial1-setup.sh
@@ -65,8 +65,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=Terminal
-Name[en_US]=Terminal
+Name=ONOS
+Name[en_US]=ONOS
 Icon=konsole
 Exec=/usr/bin/xterm -e '/opt/onos/apache-karaf-3.0.2/bin/client -u karaf'
 Comment[en_US]=
@@ -76,10 +76,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=Terminal
+Name=Mininet
 Name[en_US]=Mininet
 Icon=konsole
-Exec=/usr/bin/xterm -e 'sudo python ~/onos-next/tools/test/topos/sol.py 127.0.0.1'
+Exec=/usr/bin/xterm -e 'sudo mn --custom ~/onos-next/tools/test/topos/tower.py --topo tower --controller remote,${1:-192.168.2.1} --mac'
 Comment[en_US]=
 EOF
 
@@ -89,10 +89,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Name=Teaching with Mininet
-Name[en_US]=Teaching with Mininet
+Name=ONOS Tutorial
+Name[en_US]=ONOS Tutorial
 Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://teaching.mininet.org
+Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Basic+ONOS+Tutorial
 Comment[en_US]=
 EOF