more work
bug fix in .eventMatches()