fixes to question 1