week1 fixes