Fixing bugs, simplifying node port lookup