Node selection etc much better

Yay!