@c2theg I'll be back on the ground soon, then I can integrate your changes (and a few others) back into the tree.