more improvements to data schema and scaffoled out