diff --git a/.gitignore b/.gitignore
index e387c3b5..95aa4ea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-data.json
 config.json
-
+data.json
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -91,3 +90,4 @@ ENV/
 
 # Rope project settings
 .ropeproject
+run_private.bat
diff --git a/data.json b/data.json
index 41b42e67..0db3279e 100644
--- a/data.json
+++ b/data.json
@@ -1,3 +1,3 @@
-[
+{
 
-]
+}
diff --git a/favicon.png b/favicon.png
new file mode 100644
index 00000000..c7646f76
Binary files /dev/null and b/favicon.png differ
diff --git a/index.html b/index.html
index 26ba3cf2..333a7786 100644
--- a/index.html
+++ b/index.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>PokeScanner</title>
+    <title>PokéScanner</title>
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
     <meta charset="utf-8">
+    <link rel="icon" type="image/png" href="favicon.png" sizes="192x192">
     <style>
       html, body {
         height: 100%;
@@ -19,11 +20,11 @@
         margin: 5px;
         font-size: 12px;
         font-family: Arial, sans-serif;
-        height: 255px;
-        width: 150px;
+        height: 28em;
+        width: 28ex;
       }
       #legend div {
-       height: 210px;
+       height: 24em;
        overflow: auto;
       }
       #legend li {
@@ -72,100 +73,160 @@
         return (date.getUTCMinutes() > 0 ? date.getUTCMinutes() + "m " : "") + date.getUTCSeconds() + "s";
       }
 
-      function getImage(p) {
-        var name = p.name;
-        if (p.name == "Nidoran F") {
-          name = "Nidoran";
-        }
-        else if (name == "Nidoran M") {
-          name = "Nidorano";
-        }
-        return "http://icons.iconarchive.com/icons/hektakun/pokemon/72/" + pad(p.id, 3) + "-" + cap(name) + "-icon.png";
-      }
-
       function toggleLayer(checked, pkmn) {
         if (checked) {
-            hidden_layers.push(pkmn);
+            hidden_layers[pkmn] = 1;
         } else {
-            var index = hidden_layers.indexOf(pkmn);
-            if(index > -1){
-              hidden_layers.splice(index,1);
-            }
+            delete hidden_layers[pkmn];
         }
         refreshData();
       };
+      
+      function pkmn_label(pkmn) {
+        var elemname = "#" + pkmn.id + ". " + pkmn.name;
+        if (pkmn.id == -1) {
+          elemname = "(player)";
+        }
+        return elemname;
+      }
 
 
+      var preLength = -1;
+      var pkmn_size, pkmn_anchor;
       function refreshData() {
-        getFile("data.json", true, function(response) {
+        getFile("data.json?t=" + (new Date()).getTime(), true, function(response) {
+          if ('undefined' == typeof pkmn_size) {
+            // Maps API might not be loaded before the first refresh
+            pkmn_size = new google.maps.Size(30, 30);
+            pkmn_anchor = new google.maps.Point(15, 15);
+          }
+
           console.log("Refreshing data...");
-          var preLength = data.length;
           data = JSON.parse(response);
 
-          if (preLength != data.length) {
+          if (preLength != response.length) {
+            preLength = response.length;
             // Clear markers
-            for (var i = 0; i < markers.length; i++) {
-              listeners[i].a.remove();
-              listeners[i].b.remove();
-              markers[i].setMap(null);
+            for (var pokehash in markers) {
+              if (!markers.hasOwnProperty(pokehash)) {
+                continue;
+              }
+              if (data.hasOwnProperty(pokehash) && hidden_layers[data[pokehash].id] != 1) {
+                continue;
+              }
+              var marker = markers[pokehash];
+              marker.listeners[0].remove();
+              marker.listeners[1].remove();
+              marker.setMap(null);
+              
+              delete markers[pokehash];
             }
-            listeners = [];
-            markers = [];
 
             // Add updated markers
-            for (var i = 0; i < data.length; i++) {
-              var p = data[i];
+            var numPkmnType = {};
+            for (var pokehash in data) {
+              if (!data.hasOwnProperty(pokehash)) {
+                // inherited, not interesting to us
+                continue;
+              }
+              var p = data[pokehash];
+              if (numPkmnType.hasOwnProperty(p.id)) {
+                numPkmnType[p.id] += 1;
+              } else {
+                numPkmnType[p.id] = 1;
+              }
               if (!updated) {
                 map.setZoom(16);
                 map.panTo({lat: p.lat, lng: p.lng});
                 updated = true;
               }
 
-              if(hidden_layers.indexOf(p.name) == -1){
+              if (layers.findIndex(function(v){ return v.id == p.id; }) == -1) {
+                console.log("Adding layer " + pkmn_label(p));
+                layers.push(p);
+                layers.sort(function(a, b){ return a.id - b.id; });
+                document.getElementById('pknum').innerHTML = " (" + (layers.length - 1) + ")";
+              }
+
+              if (hidden_layers[p.id] != 1) {
                 // Pokemon not hidden
-                if(layers.indexOf(p.name) == -1){
-                  layers.push(p.name);
+
+                p.timeleft = p.expiry - p.timestamp;
+                timeleft_strify = p.timeleft
+                p.timeleft_str = ''
+                if (timeleft_strify > 86400) {
+                    p.timeleft_str += Math.floor(timeleft_strify / 86400) + " days, ";
+                    timeleft_strify %= 86400;
+                }
+                if (timeleft_strify > 3600) {
+                    p.timeleft_str += Math.floor(timeleft_strify / 3600) + "h";
+                    timeleft_strify %= 3600;
+                }
+                if (timeleft_strify > 60) {
+                    p.timeleft_str += Math.floor(timeleft_strify / 60) + "m";
+                    timeleft_strify %= 60;
                 }
-                console.log("Adding marker " + p.name);
+                p.timeleft_str += Math.floor(timeleft_strify) + "s";
+                
+                detail_str = "<b>" + pkmn_label(p) + "</b><br>Time left: " + p.timeleft_str + "<br>Lat: " + p.lat + "<br>Long: " + p.lng;
+
+                if (markers.hasOwnProperty(pokehash)) {
+                  markers[pokehash].details = detail_str;
+                  continue;
+                }
+
+                console.log("Adding marker " + pkmn_label(p));
 
                 var infowindow = new google.maps.InfoWindow({
                 });
 
-                var image = getImage(p);
+                var image = "https://raw.githubusercontent.com/AHAAAAAAA/PokemonGo-Map/master/static/icons/" + p.id + ".png";
+                if (p.id == -1) {
+                    //image = 'https://agents.farmers.com/images/walking.png';
+                    image = null;
+                }
 
                 var marker = new google.maps.Marker({
                   map: map,
                   position: {lat: p.lat, lng: p.lng},
                   label: "",
-                  title: "<b>"+p.name+"</b><br>Time left: " + formatSeconds(p.timeleft) + "<br>Lat: "+p.lat+"<br>Long: "+p.lng,
-                  icon: image
+                  details: detail_str,
+                  icon: {
+                    scaledSize: pkmn_size,
+                    anchor: pkmn_anchor,
+                    url: image
+                  }
                 });
 
-                var listenerPair = {
-                  a: google.maps.event.addListener(marker, 'mouseover', function() {
-                    infowindow.setContent(this.title);
+                var listenerPair = [
+                  google.maps.event.addListener(marker, 'mouseover', function() {
+                    infowindow.setContent(this.details);
                     infowindow.open(map, this);
                   }),
 
-                  b: google.maps.event.addListener(marker, 'mouseout', function() {
+                  google.maps.event.addListener(marker, 'mouseout', function() {
                     infowindow.close(map, this);
                   })
-                };
+                ];
 
-                listeners.push(listenerPair);
-                markers.push(marker);
+                marker.listeners = listenerPair;
+                markers[pokehash] = marker;
               }
             }
 
             // Draw layer manager
             var list = document.getElementById('legend-list');
             var content = [];
-            for (var id in layers) {
-              var pkmn = layers[id];
-              var checked = hidden_layers.indexOf(pkmn) != -1 ? "checked": "";
-              content.push("<li><input type='checkbox' id='" + pkmn +  "'" +
-              " onclick='toggleLayer(this.checked, this.id)' "+checked+"\/>" +
-              pkmn + "<\/li>");
+            for (var i = 0; i < layers.length; ++i) {
+              var pkmn = layers[i];
+              if (!numPkmnType.hasOwnProperty(pkmn.id)) {
+                numPkmnType[pkmn.id] = 0;
+              }
+              var checked = hidden_layers[pkmn.id] == 1 ? "checked": "";
+              var elemname = pkmn_label(pkmn);
+              content.push("<li><input type='checkbox' id='hide_" + pkmn.id +  "'" +
+              " onclick='toggleLayer(this.checked, this.id.substr(5))' "+checked+"\/>" +
+              elemname + " (" + numPkmnType[pkmn.id] + ")" + "<\/li>");
             }
             list.innerHTML = content.join('');
           }
@@ -174,17 +235,19 @@
 
       data = {};
       map = null;
-      markers = [];
-      listeners = [];
-      hidden_layers = [];
+      markers = {};
+      hidden_layers = {};
       layers = [];
       updated = false;
 
 
       getFile("config.json", false, function(configData) {
-        config = JSON.parse(configData)
+        config = JSON.parse(configData);
         console.log("Using api key: " + config.GOOGLE_MAPS_API_KEY);
         loadScript("https://maps.googleapis.com/maps/api/js?key=" + config.GOOGLE_MAPS_API_KEY + "&libraries=drawing&callback=initMap");
+        for (var i = 0; i < config.hidden_pkmn.length; ++i) {
+          hidden_layers[config.hidden_pkmn[i]] = 1;
+        }
       });
 
       function initMap() {
@@ -198,7 +261,7 @@
         var legend = document.createElement('div');
         legend.id = 'legend';
         var content = [];
-        content.push('<h3>Hide Pokemon</h3>');
+        content.push('<h3>Hide Pokemon<span id="pknum"></span></h3>');
         content.push('<div id="legend-list"></div>');
         legend.innerHTML = content.join('');
         legend.index = 1;
diff --git a/main.py b/main.py
index c1ad1b7d..cee03abc 100644
--- a/main.py
+++ b/main.py
@@ -53,7 +53,7 @@ def getNeighbors():
 
 NUM_STEPS = 5
 DATA_FILE = 'data.json'
-DATA = []
+DATA = {}
 
 def f2i(float):
   return struct.unpack('<Q', struct.pack('<d', float))[0]
@@ -66,12 +66,17 @@ def h2f(hex):
 
 def prune():
     # prune despawned pokemon
-    cur_time = int(time.time())
-    for i, poke in reversed(list(enumerate(DATA))):
-        poke['timeleft'] = poke['timeleft'] - (cur_time - poke['timestamp'])
+    cur_time = time.time()
+    for (pokehash, poke) in DATA.items():
         poke['timestamp'] = cur_time
-        if poke['timeleft'] <= 0:
-            DATA.pop(i)
+        if poke['expiry'] <= cur_time:
+            del DATA[pokehash]
+
+try:
+    with open(DATA_FILE, 'r') as f:
+        DATA = json.load(f)
+except:
+    pass
 
 def write_data_to_file():
     prune()
@@ -80,14 +85,25 @@ def write_data_to_file():
         json.dump(DATA, f, indent=2)
 
 def add_pokemon(pokeId, name, lat, lng, timestamp, timeleft):
-    DATA.append({
-        'id': pokeId,
-        'name': name,
-        'lat': lat,
-        'lng': lng,
-        'timestamp': timestamp,
-        'timeleft': timeleft
-    });
+    expiry = timestamp + timeleft
+    pokehash = '%s:%s:%s' % (lat, lng, pokeId)
+    if pokehash in DATA:
+        if abs(DATA[pokehash]['expiry'] - expiry) < 2:
+            # Assume it's the same one and average the expiry time
+            DATA[pokehash]['expiry'] += expiry
+            DATA[pokehash]['expiry'] /= 2
+        else:
+            print('[-] Two %s at the same location (%s,%s)' % (name, lat, lng))
+            DATA[pokehash]['expiry'] = max(DATA[pokehash]['expiry'], expiry)
+    else:
+        DATA[pokehash] = {
+            'id': pokeId,
+            'name': name,
+            'lat': lat,
+            'lng': lng,
+            'timestamp': timestamp,
+            'expiry': expiry
+        }
 
 def set_location(location_name):
     geolocator = GoogleV3()
@@ -141,6 +157,7 @@ def api_req(api_endpoint, access_token, *mehs, **kw):
             protobuf = p_req.SerializeToString()
 
             r = SESSION.post(api_endpoint, data=protobuf, verify=False)
+            reqtime = time.time()
 
             p_ret = pokemon_pb2.ResponseEnvelop()
             p_ret.ParseFromString(r.content)
@@ -155,8 +172,8 @@ def api_req(api_endpoint, access_token, *mehs, **kw):
             if DEBUG:
                 print("[ ] Sleeping for 1 second")
             time.sleep(1)
-            return p_ret
-        except Exception, e:
+            return (reqtime, p_ret)
+        except Exception as e:
             if DEBUG:
                 print(e)
             print('[-] API request error, retrying')
@@ -194,9 +211,12 @@ def get_profile(access_token, api, useauth, *reqq):
     return api_req(api, access_token, req, useauth = useauth)
 
 def get_api_endpoint(access_token, api = API_URL):
-    p_ret = get_profile(access_token, api, None)
+    (rtime, p_ret) = get_profile(access_token, api, None)
     try:
-        return ('https://%s/rpc' % p_ret.api_url)
+        if p_ret.api_url:
+            return ('https://%s/rpc' % p_ret.api_url)
+        else:
+            return None
     except:
         return None
 
@@ -218,7 +238,7 @@ def login_ptc(username, password):
     ticket = None
     try:
         ticket = re.sub('.*ticket=', '', r1.history[0].headers['Location'])
-    except Exception, e:
+    except Exception as e:
         if DEBUG:
             print(r1.json()['errors'][0])
         return None
@@ -255,19 +275,22 @@ def raw_heartbeat(api_endpoint, access_token, response):
     m.lat = COORDS_LATITUDE
     m.long = COORDS_LONGITUDE
     m1.message = m.SerializeToString()
-    response = get_profile(
-        access_token,
-        api_endpoint,
-        response.unknown7,
-        m1,
-        pokemon_pb2.RequestEnvelop.Requests(),
-        m4,
-        pokemon_pb2.RequestEnvelop.Requests(),
-        m5)
+    while True:
+        (hbtime, response) = get_profile(
+            access_token,
+            api_endpoint,
+            response.unknown7,
+            m1,
+            pokemon_pb2.RequestEnvelop.Requests(),
+            m4,
+            pokemon_pb2.RequestEnvelop.Requests(),
+            m5)
+        if response.payload:
+            break
     payload = response.payload[0]
     heartbeat = pokemon_pb2.ResponseEnvelop.HeartbeatPayload()
     heartbeat.ParseFromString(payload)
-    return heartbeat
+    return ((FLOAT_LAT, FLOAT_LONG), hbtime, heartbeat)
 
 def heartbeat(api_endpoint, access_token, response):
     while True:
@@ -304,15 +327,16 @@ def scan(api_endpoint, access_token, response, origin, pokemons):
 
         visible = []
 
-        for hh in hs:
+        for (coords, hbtime, hh) in hs:
+            add_pokemon(-1, 'player', deflat, deflng, hbtime, 5)
             for cell in hh.cells:
                 for wild in cell.WildPokemon:
                     hash = wild.SpawnPointId + ':' + str(wild.pokemon.PokemonId)
                     if (hash not in seen):
-                        visible.append(wild)
+                        visible.append((hbtime, wild))
                         seen.add(hash)
 
-        for cell in h.cells:
+        for cell in h[2].cells:
             if cell.NearbyPokemon:
                 other = LatLng.from_point(Cell(CellId(cell.S2CellId)).get_center())
                 diff = other - origin
@@ -324,7 +348,7 @@ def scan(api_endpoint, access_token, response, origin, pokemons):
                 for poke in cell.NearbyPokemon:
                         print('    (%s) %s' % (poke.PokedexNumber, pokemons[poke.PokedexNumber - 1]['Name']))
 
-        for poke in visible:
+        for (timestamp, poke) in visible:
             other = LatLng.from_degrees(poke.Latitude, poke.Longitude)
             diff = other - origin
             # print(diff)
@@ -346,7 +370,6 @@ def scan(api_endpoint, access_token, response, origin, pokemons):
         print('[+] Scan: %0.1f %%' % (((steps + (pos * .25) - .25) / steplimit**2) * 100))
 
 def main():
-    write_data_to_file()
     pokemons = json.load(open('pokemon.json'))
     parser = argparse.ArgumentParser()
     parser.add_argument("-u", "--username", help="PTC Username", required=True)
@@ -369,30 +392,35 @@ def main():
         return
     print('[+] RPC Session Token: {} ...'.format(access_token[:25]))
 
-    api_endpoint = get_api_endpoint(access_token)
-    if api_endpoint is None:
-        print('[-] RPC server offline')
-        return
+    while True:
+        api_endpoint = get_api_endpoint(access_token)
+        if api_endpoint is None:
+            print('[-] RPC server offline')
+        else:
+            break
     print('[+] Received API endpoint: {}'.format(api_endpoint))
 
-    response = get_profile(access_token, api_endpoint, None)
-    if response is not None:
-        print('[+] Login successful')
-
-        payload = response.payload[0]
-        profile = pokemon_pb2.ResponseEnvelop.ProfilePayload()
-        profile.ParseFromString(payload)
-        print('[+] Username: {}'.format(profile.profile.username))
-
-        creation_time = datetime.fromtimestamp(int(profile.profile.creation_time)/1000)
-        print('[+] You are playing Pokemon Go since: {}'.format(
-            creation_time.strftime('%Y-%m-%d %H:%M:%S'),
-        ))
-
-        for curr in profile.profile.currency:
-            print('[+] {}: {}'.format(curr.type, curr.amount))
-    else:
-        print('[-] Ooops...')
+    while True:
+        (rtime, response) = get_profile(access_token, api_endpoint, None)
+        if response is not None and len(response.payload):
+            print('[+] Login successful')
+
+            payload = response.payload[0]
+            profile = pokemon_pb2.ResponseEnvelop.ProfilePayload()
+            profile.ParseFromString(payload)
+            print('[+] Username: {}'.format(profile.profile.username))
+
+            creation_time = datetime.fromtimestamp(int(profile.profile.creation_time)/1000)
+            print('[+] You are playing Pokemon Go since: {}'.format(
+                creation_time.strftime('%Y-%m-%d %H:%M:%S'),
+            ))
+
+            for curr in profile.profile.currency:
+                print('[+] {}: {}'.format(curr.type, curr.amount))
+
+            break
+        else:
+            print('[-] Ooops...')
 
     origin = LatLng.from_degrees(FLOAT_LAT, FLOAT_LONG)
 
