node labelling bug fixes