some more reworking of question fragments