Expanded variable matching to include anything but space chars. Changed $vars to Define type to better distinguish. Added wider operator support.