Ontology is working, and some minor changes