Add fast mode and match limit knobs