Fixed schedule by week, more fixes