updated locations:

-fixed coords
-fixed some IDs
-removed a few redundancies