a lot of changes

mostly week 3