lots of updates to last week+new material for next