Adding Token URL and fixing other URL's