Improved DM2e->EDM mapping, fixed ontologies, basic CLI