Time calculations fix, as well as days difference fix