Punchestowns back on track