Try to make range just full day and some more tidbits