Clean up doc, fix schema