redoing of locations and shit

i redid locations because it was badly done