Add symbolic constants for scale!  Clean up diagmm methods.