Commit of Knurg's changes

adaptions to pathbuilder changes