Always include last date when counting days, minor fixes