Should now save the correct number of files
Sorted questions and surveys - I hope