week 6 fixes