more changes for schema

formatting mainly, maybe more