Added working dialogs and generic improvements.