fix week of season bug for dates that extend into new year
refactor current week to be a little easier on the eyes.