Correction of scale formulas; further restructuring of the framework