week4 fixes