continued cleanup

the 7 day Q 10 is not implemented correctly however the issue with
rolling averages including days separated by more than 365 is still
present.