diff --git a/vm-setup.sh b/vm-setup.sh
index 3024f81..22d79e1 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -26,8 +26,7 @@
 
 git clone https://bitbucket.org/lantz/cs144-dhcp.git
 cd cs144-dhcp
-# TODO fix this
-#sudo ./dhcp.py --check-required
+sudo python -c "import dhcp; dhcp.checkRequired()"
 cd ~
 
 # -------------- Offline content -------------
@@ -38,18 +37,27 @@
 cd mininet.wiki
 grip --gfm --export Bufferbloat.md
 grip --gfm --export Dhcp-masquerade-attack.md
+grip --gfm --export BGP-Path-Hijacking-Attack-Demo.md
 
 # -------------- Setup Desktop ----------------
 sudo apt-get install -y xorg lxde
 
 #TODO: add backgrounds folder
+sudo mkdir /usr/share/backgrounds
 #TODO: change background
 # 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
 
+# Automatically start LXDE on login
+echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx' >> ~/.bashrc
+
+# Automatically log into the VM
+sudo sed -i 's/exec /sbin/getty -8 38400 tty1//g' /etc/init/tty1.conf
+echo 'exec /bin/login -f bob < /dev/tty1 > /dev/tty1 2>&1' | sudo tee -a /etc/init/tty1.conf
+
 # Disable screensaver
-##sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
+sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
 cat > ${USER_HOME}/.xsessionrc << EOF
 # disable screensaver
 xset s off
@@ -58,8 +66,10 @@
 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
+#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
+sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' /usr/share/lxterminal/lxterminal.conf
+sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' /usr/share/lxterminal/lxterminal.conf
 
 DESKTOP=${USER_HOME}/Desktop
 OFFLINE="${DESKTOP}/Offline Exercises"
@@ -111,6 +121,28 @@
 Comment[en_US]=
 EOF
 
+cat > "${OFFLINE}/DHCP Attack" << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=DHCP Attack
+Name[en_US]=DHCP Attack
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/Dhcp-masquerade-attack.html
+Comment[en_US]=
+EOF
+
+cat > "${OFFLINE}/BGP Hijacking" << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=BGP Hijacking
+Name[en_US]=BGP Hijacking
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser file:///home/mininet/mininet.wiki/BGP-Path-Hijacking-Attack-Demo.html
+Comment[en_US]=
+EOF
+
 # ------------- Install Other Tools ------------- 
 sudo apt-get install -y wireshark
 # Enable root-less wireshark and add mininet