fixed so urls are correct
decreased timeout to 18/15