Update bonnie vhost
Sort some options