minor tweaks to Unit 6
first pass at Unit 7 (also remove unit 7 lessons after consolidation)