add latest round of changes, labeling widget, etc.