Changed to real url, made minor perfomance fixes