Resolved ConcurrentModificationExceptions with ConcurentHashMap, Fixed issue where current location indicator was not updated