fixes to schema and cli