Node improvements

Can you please take this discussion into another thread … it bears only remotely relevance.