Limit abatement costs to output
Fix units in tax rate
Merge remote-tracking branch 'origin/develop' into develop