added guarding and some vagrant fixes