fixed datestring issues