Fixed question count

Showing correct X/Y question header
Can set number of questions to be asked