fixed up new pagination bugs

i didn't realise that tim's thing didn't pass through the list of
challenges that should appear on each page. and a couple of other things
were changed to make it neater :)