date fin updated + some date fix