added onmatch to graphparser
removed debug code