Disabled error support, but fixed handling of new nodes
Fleshed out demo, tweaked logging