add weekday + fix task sort