BUGFIX: Change year format from o to Y to stop weeks that overlap years getting the wrong year

And allow passing of Date fields that lack timestamps