Uniform multiday/week_y models (correct PF bug)