Add error dialogs, improve formats