week 2,3,4 fixes