Fixed url bug and adding more loc