fixed a few things in locations, still needs work