default and connector labeling improvements