Removed some hard coded urls
Changed some global variables