Week 6 finished + warnings resolved