Nodeimprovements

Improvements to positioning