More scaling bug fixes and add scaling to newsoldier state