major cleanup of ModelData, no longer store rates and amounts in the same array, renamed things to consistent convention