Minor fixes
Commented out defintion of NODE1 (overlapping f with NODE)