More math

Test plan: look at each problem type in local mode

Auditors: alex