Improvements, Vagrant (?)
Fixes