More corrections
Remerge
Week 7 regenerated