adding some more unmerged nodebuilder changes from pyramid-branch