quote cleanup, and addition of virtual_server default options