- Second stage of week checker function cleanup. Added support for ranges.