@anlai so do we want to get rid of the scale terms?  are we using it anywhere?  I'll leave that to you guys since those are your pages, but I don't think they are needed to render the evals.  They WILL be nice in the archive so we can do quick calculations, but we can compute that once on the fly when we are doing the archiving.