fixed None and early morning issues