Lots of updates to vm installation