Better 'today' detection