fix for the urls
and more fixes