Some changes, esp a fixed schema ontology