More dialogs and fixes