Completion indicator

Hi Tom, we needed to indicate to the user of how far through the questions they are, so that's here along with a couple of minor bug fixes.