416 changes

Updated schema, edited content, still more to do (a test commit)