Expanded calculation accumulators to hold multiple years
Biodiversity calculation fixes