Several fixes/improvements to NewOption ontology