Add node ID number
Fix small comparison bug and whitespace issue