some updates to scaffold