Merge pull request #335 from vlidholt/nodeimprovements

Nodeimprovements
More bug fixes for new positioning