Fixed some ontologies, added/fixed a few query methods, added comments