many week 7 feedback fixes