fixing date stuff