Updates for tutorial Part 7

Still some issues.