draft of week 7 material for pip2; small fixes to week 6