final with some tweaks to clean up nonsense and ontologies