More node changes/additions