change our day/stop heuristics, fixes many lines