Fix bug with multiple files (just reinstantiate rubric), add per-file header