scaffolding tweaks