change parser to match runtime changes, still some kooky issue where child events...