More updates to multi-node; last pass