Questionnaire tweaks

still a couple more commits to come,  the way that I ended up implementing the js means that we can get rid of a lot of the stuff from my earlier commits.