I'm in the middle of editing this, and have reached a point of introducing new nodes.
This means that merging any changes will likely be a nightmare.
Unfortunately, the node structure is still messed up, and I'm unwilling to push changes until it's fixed.
So please, if anyone's thinking about editing this, hold off until future notice.
Cheers, r