move the vagrant network hack to the provisioning
add fixmes