initial edits to get working in vagrant