Solved date problems (I think)