fixed calculator to be per week; closes #1038