fixe example that wasn't working
fix typo
various changes to simplify the materials

moved command line args to session 4, demoted lambdas, simplified
variabel scope session. Updated solutions to match changes.
Merge branch 'master' into release
update to changes from master