target node refactoring
small fixes