WIP
kwargs are better here
Fixes to uri_to_iri
More fixes
Fixing iri_to_uri
Fixed url_fix
Fixed some tests