update for V00-00-02 branches
use scale1fb weight, other cleanup