Better tweaks to the scaling variables

Thursday is attacking my phone.  Must be about right.