fix Node#match bug
refactor nodebuilder