Allow intensity and delay to be variables

And more patterns