week 7 fixes