Lots of fixes for date related stuff and sorting out bugs caused assuming content is good!