url unification and fixes