cleanup comments but missing right text to popup for buttons