copied fixes to week 02 for resubmission