updated schema and passed some tests
merged branch into develop with schema update and passed some tests