vagrant support, a few bugfixes