add challenge questions and tidy up formatting a bit