Added short headings for each group of questions, some small other
changes