various scaffolding changes