stronger match support and better events

also the ability to more easily bypass short circuiting