diff --git a/doc/README.md b/doc/README.md
index 7f6d597c36..874be56dd9 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -3,6 +3,7 @@
 ## Tools necessary for Composite
 ```
 sudo apt-get -y install bc  
+sudo apt-get -y install g++
 sudo apt-get -y install gcc-multilib  
 sudo apt-get -y install binutils-dev  
 sudo apt-get -y install qemu-kvm  
@@ -25,7 +26,7 @@ $ git clone /~https://github.com/gparmer/composite.git composite
 $ cd composite/src/
 $ make init
 $ make
-$ make run RUNSCRIPT=kernel_tests.sh run      # microbenchmarks
+$ make run RUNSCRIPT=kernel_tests.sh run      # Kernel unit tests
 $ make run RUNSCRIPT=unit_schedtests.sh run # simple scheduler tests
 ```
 
diff --git a/tools/Vagrantfile b/tools/Vagrantfile
index eb4cdda103..f7059cab19 100644
--- a/tools/Vagrantfile
+++ b/tools/Vagrantfile
@@ -7,8 +7,8 @@ Vagrant.configure(2) do |config|
     config.vm.provider "virtualbox" do |v|
         v.name = "composite_dev"
         v.memory = 1024
-        v.cpus = 2
-        v.customize ["modifyvm", :id, "--paravirtprovider", "kvm"]
+        v.cpus = 4
+        v.customize ["modifyvm", :id, "--paravirtprovider", "kvm", "--ioapic", "on"]
     end
 
     # Disable the default syncing
@@ -16,15 +16,21 @@ Vagrant.configure(2) do |config|
     # Instead sync the actual composite folder
     config.vm.synced_folder "../", "/home/vagrant/composite"
 
-    config.vm.provision "shell", inline: <<-SHELL
+    config.vm.provision "shell", privileged: false, inline: <<-SHELL
         sudo apt-get update
         sudo apt-get -y install make
         sudo apt-get -y install git
         sudo apt-get -y install ntp
         sudo apt-get -y install bc
+        sudo apt-get -y install g++
         sudo apt-get -y install gcc-multilib
         sudo apt-get -y install binutils-dev
         sudo apt-get -y install build-essential
         sudo apt-get -y install qemu-kvm
+        curl https://sh.rustup.rs -sSf | sh -s -- -y
+        source $HOME/.cargo/env
+        rustup default nightly
+        cargo install xargo
+        rustup component add rust-src
     SHELL
 end