big ol merge, plus some python fixes
lots of user-node fixes