Better handling of edit abort & multiple edits