node management improvements