adding scaffolds, and some minor updates