Improvements to scaffold and docs