diff --git a/P4D2_2018_East/vm/Vagrantfile b/P4D2_2018_East/vm/Vagrantfile
index 0802c15..10da283 100644
--- a/P4D2_2018_East/vm/Vagrantfile
+++ b/P4D2_2018_East/vm/Vagrantfile
@@ -18,6 +18,8 @@ Vagrant.configure(2) do |config|
                 "--port", "0", "--device", "0", 
                 "--type", "dvddrive", 
                 "--medium", "emptydrive"]    
+    vb.customize ["modifyvm", :id, "--vram", "32"]
+
   end
   config.vm.synced_folder '.', '/vagrant', disabled: true  
   config.vm.hostname = "p4"
diff --git a/P4D2_2018_East/vm/root-bootstrap.sh b/P4D2_2018_East/vm/root-bootstrap.sh
index 0cc24a7..357f74f 100755
--- a/P4D2_2018_East/vm/root-bootstrap.sh
+++ b/P4D2_2018_East/vm/root-bootstrap.sh
@@ -8,8 +8,8 @@ sudo add-apt-repository ppa:webupd8team/atom
 
 apt-get update
 
+KERNEL=$(uname -r)
 DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
-
 apt-get install -y --no-install-recommends \
   atom \
   autoconf \
@@ -46,6 +46,7 @@ apt-get install -y --no-install-recommends \
   libreadline6-dev \
   libssl-dev \
   libtool \
+  linux-headers-$KERNEL\
   lubuntu-desktop \
   make \
   mktemp \
diff --git a/P4D2_2018_East/vm/user-bootstrap.sh b/P4D2_2018_East/vm/user-bootstrap.sh
index cb2bfaf..aa8074e 100644
--- a/P4D2_2018_East/vm/user-bootstrap.sh
+++ b/P4D2_2018_East/vm/user-bootstrap.sh
@@ -117,8 +117,12 @@ sudo chown -R p4:p4 /home/p4/tutorials
 
 # Emacs
 sudo cp p4_16-mode.el /usr/share/emacs/site-lisp/
-echo "(add-to-list 'auto-mode-alist '(\"\\.p4\\'\" . p4_16-mode))" | sudo tee /home/p4/.emacs
-sudo chown p4:p4 /home/p4/.emacs
+sudo mkdir /home/p4/.emacs.d/
+echo "(autoload 'p4_16-mode' \"p4_16-mode.el\" \"P4 Syntax.\" t)" > init.el
+echo "(add-to-list 'auto-mode-alist '(\"\\.p4\\'\" . p4_16-mode))" | tee -a init.el
+sudo mv init.el /home/p4/.emacs.d/
+sudo ln -s /usr/share/emacs/site-lisp/p4_16-mode.el /home/p4/.emacs.d/p4_16-mode.el
+sudo chown -R p4:p4 /home/p4/.emacs.d/
 
 # Vim
 cd /home/vagrant
@@ -175,4 +179,6 @@ EOF
 sudo mkdir -p /home/p4/Desktop
 sudo mv /home/${USER}/Desktop/* /home/p4/Desktop
 sudo chown -R p4:p4 /home/p4/Desktop/
+
+# Do this last!
 sudo reboot