Updated schema and additions, and test data
Fixed some coding issues that resulted from the schema changes
More shema changes