some more ontology, and bugfixes