More bug fixes for new positioning
Merge pull request #336 from vlidholt/nodeimprovements

Nodeimprovements