updated scaffolds and some setup files