mid-simple node changes, committed for repo switchover