#330: Schema updates

opened by tcatapano

numerous changes to schema see #41, #15, #14, #16, #42