The dates behave more nicely now. Not yet perfect.