week03 fixes
w04
w06 task