New vagrant stuff, reduced errors, made more generic