More comments and add error dialogs