add node name and other fixes