Build including the new vars for the hotplug (although they are not used as of yet). Add shortsweep option for s2w. Multiple sweeps are suppressed.