cleaned and fixed dialogs