date issues fixed