Added mam-demo program, presentation improvements