bug fixes for schema, rework some utilities calls