Better handling of yes|no questions + Minor Ontology changes