week 4 fix and some week 5 work