more scaffolder improvements