Fixed syntax errors, improved VMware support