Brooklyn node effector and various cleanups

bunch of cleanups; the main changes are in the last two commits