Improvements to Tutorials 6 and 7