update for changes in sampler-scaffold; adjust spaces