fixed some date issues