Reformat answers, add questions