Session 7 close to final, some clean-up for session 5