Fixed some problems with the dates
Fixed all the problems with the dates