fixes to schema
MORE fixes to schema