updated location map, some work on results