Fixed up numbering of questions again