fix dates more