fix schema and add comments