fix :VFMOpts escaping; watabou fixes