added locations, improved pathing, changed map and locations interface