Some cleanup and work on the vHosts