Ok, so apparently the code I had on my computer was from one of the old, dodgy branches. So far, updated the node class, nothing amazing but looks sexy ;-)