Minor changes
Merged
Minor changes. Getting the Elements from a node seems to be buggy.