various changes to simplify the materials

moved command line args to session 4, demoted lambdas, simplified
variabel scope session. Updated solutions to match changes.