Some updates to punchcard and samples