Minor changes

Made minor config changes and added auto detect for VMs