Lots of calendar logic updates

Includes 5 arrays of 7 data points. This week +/- 2 weeks. Accounts for
month rollover.