Corrected scale factor and more