Minor changes to NodeID and Distance