More dialogs and tidying up