Update for .24
Change wrap scaling, output more info.