Still working on punch sessions

and misc. other things