OOP changed mc spending var names

Changed suffix denoting time to 24, 60m so its consistent with the rest
of the variables
Also started wage index adjustment for other types of spending, need to
finish it