Replaces dodgy node.id code with nicknames for now.
Tidies up a few core TODOs.