Week 3 fixes added