Added correct node behaviour and fixed duplicate-problems