Finished HW week3 and some exercise changes