james | correcting handling of nodes and clients