including mage vhost
improvements