Tightened node property scoping and fixed it's consequences