Finished (hopefully?) questionnaire status tracking improvements