master
deprecated node labels: make naming consistant and remove some unused args in funcs
use generic Set in api