fixed date bugs