rolled in refactored comparisons to advanced sanitation
updated total expenditure for years calculation
wip calculation update