diff --git a/plugins/cache-portals-on-map.js b/plugins/cache-portals-on-map.js
index 2819452b2..1242c31b8 100644
--- a/plugins/cache-portals-on-map.js
+++ b/plugins/cache-portals-on-map.js
@@ -1,7 +1,7 @@
 // @author         jonatkins
 // @name           Cache viewed portals on map
 // @category       Cache
-// @version        0.1.0
+// @version        0.2.0
 // @description    Cache the details of recently viewed portals and use this to populate the map when possible
 
 
@@ -31,8 +31,8 @@ window.plugin.cachePortalDetailsOnMap.entityInject = function(data) {
 };
 
 // extend portal's GUID lookup to search in cached portals as well
-window.cachePortalDetailsOnMap.findPortalGuidByCacheE6 = function(latE6, lngE6) {
-  let guid = window.cachePortalDetailsOnMap.findPortalGuidByPositionE6old(latE6, lngE6);
+window.plugin.cachePortalDetailsOnMap.findPortalGuidByCacheE6 = function(latE6, lngE6) {
+  let guid = window.plugin.cachePortalDetailsOnMap.findPortalGuidByPositionE6old(latE6, lngE6);
 
   // PLUGIN: cache > cache
   if (guid == null) {
@@ -41,7 +41,7 @@ window.cachePortalDetailsOnMap.findPortalGuidByCacheE6 = function(latE6, lngE6)
       for (let g in cache.cache) {
         let p = cache.cache[g];
         if (latE6 == p.ent[2][2] && lngE6 == p.ent[2][3]) {
-//        console.log("newFindPortalGuidByPositionE6 matched in cache! %s %s -> [%s] = %o", latE6, lngE6, g, p);
+          console.log("findPortalGuidByCacheE6 matched in cache! %s %s -> [%s] = %o", latE6, lngE6, g, p);
           guid = g;
           break;
         }
@@ -49,17 +49,18 @@ window.cachePortalDetailsOnMap.findPortalGuidByCacheE6 = function(latE6, lngE6)
     }
   }
   return guid;
-};
+}
 
-window.cachePortalDetailsOnMap.searchInit = function () {
-    window.cachePortalDetailsOnMap.findPortalGuidByPositionE6old = window.findPortalGuidByPositionE6;
-    window.findPortalGuidByPositionE6 = window.cachePortalDetailsOnMap.findPortalGuidByCacheE6;
-};
+window.plugin.cachePortalDetailsOnMap.searchInit = function () {
+    window.plugin.cachePortalDetailsOnMap.findPortalGuidByPositionE6old = window.findPortalGuidByPositionE6;
+    window.findPortalGuidByPositionE6 = window.plugin.cachePortalDetailsOnMap.findPortalGuidByCacheE6;
+    console.log ("findPortalGuidByCacheE6 code injected");
+}
 
 window.plugin.cachePortalDetailsOnMap.setup  = function() {
 
   window.plugin.cachePortalDetailsOnMap.cache = {};
-  window.plugin.cachePortaldetailsOnMap.searchInit;
+  window.plugin.cachePortalDetailsOnMap.searchInit ();
 
   addHook('portalDetailLoaded', window.plugin.cachePortalDetailsOnMap.portalDetailLoaded);
   addHook('mapDataEntityInject', window.plugin.cachePortalDetailsOnMap.entityInject);
diff --git a/plugins/draw-tools.js b/plugins/draw-tools.js
index 81cba4572..11188d4c4 100644
--- a/plugins/draw-tools.js
+++ b/plugins/draw-tools.js
@@ -1,9 +1,8 @@
 // @author         breunigs
 // @name           Draw tools
 // @category       Draw
-// @version        0.8.0
-// @description    Allow drawing things onto the current map so you may plan your next move. Supports Multi-Project-Extension.
-
+// @version        0.8.2
+// @description    Allow drawing things onto the current map so you may plan your next move. Supports Multi-Project-Extension and Empty Drawn Fields (EDF)
 
 // HOOK: pluginDrawTools
 // custom hook for draw tools to share it's activity with other plugins
@@ -13,6 +12,14 @@ window.plugin.drawTools = function() {};
 
 window.plugin.drawTools.KEY_STORAGE = 'plugin-draw-tools-layer';
 
+window.plugin.drawTools.merge = {};
+window.plugin.drawTools.merge.status = true;
+window.plugin.drawTools.merge.toggle() = function() {
+  var status = window.plugin.drawTools.merge.status;
+  status = Boolean(!status);
+  window.plugin.drawTools.merge.status = status;
+ }
+
 window.plugin.drawTools.getMarkerIcon = function(color) {
   if (!color) {
     console.warn('Color is not set (default #a24ac3 will be used)');
@@ -258,9 +265,17 @@ window.plugin.drawTools.import = function(data) {
 
 
 //Draw Tools Options
-
 // Manual import, export and reset data
 window.plugin.drawTools.manualOpt = function() {
+	var mergeStatusCheck = '';
+	if(!window.plugin.drawTools.merge.status){
+		mergeStatusCheck = 'checked';
+	}
+
+  var edfStatusCheck = '';
+  if(!window.plugin.drawTools.edf.obj.status){
+    edfStatusCheck = 'checked';
+  }
 
   var html = '<div class="drawtoolsStyles">'
            + '<input type="color" name="drawColor" id="drawtools_color"></input>'
@@ -268,11 +283,17 @@ window.plugin.drawTools.manualOpt = function() {
            + '</div>'
            + '<div class="drawtoolsSetbox">'
            + '<a onclick="window.plugin.drawTools.optCopy();" tabindex="0">Copy Drawn Items</a>'
+           + '<center><label id="MergeToggle"><input type="checkbox" '+mergeStatusCheck+' name="merge" '
+           +   'onchange="window.plugin.drawTools.merge.toggle();return false;" />Reset draws before paste or import</label></center>'
+           //+ '<center><input type="checkbox" name="merge" id="drawtools_merge"></input> Do not overwrite, merge!</center>'
            + '<a onclick="window.plugin.drawTools.optPaste();return false;" tabindex="0">Paste Drawn Items</a>'
            + '<a onclick="window.plugin.drawTools.optImport();return false;" tabindex="0">Import Drawn Items</a>'
            + '<a onclick="window.plugin.drawTools.optExport();return false;" tabindex="0">Export Drawn Items</a>'
            + '<a onclick="window.plugin.drawTools.optReset();return false;" tabindex="0">Reset Drawn Items</a>'
            + '<a onclick="window.plugin.drawTools.snapToPortals();return false;" tabindex="0">Snap to portals</a>'
+           + '<center><label id="edfToggle" style="color: #ffce00; cursor:pointer; display:block;">'
+           +    '<input type="checkbox" '+edfStatusCheck+' name="edf"'
+           +    'onchange="window.plugin.drawTools.edf.action.toggle();return false;" />Fill the polygon(s)</label></center>'
            + '</div>';
 
   dialog({
@@ -359,11 +380,30 @@ window.plugin.drawTools.optCopy = function() {
       if (stockWarnings.noCircle) stockWarnTexts.push('Warning: Circles cannot be exported to stock intel');
       if (stockWarnings.noMarker) stockWarnTexts.push('Warning: Markers cannot be exported to stock intel');
       if (stockWarnings.unknown) stockWarnTexts.push('Warning: UNKNOWN ITEM TYPE');
-
+/*
       var html = '<p><a onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea\').select();">Select all</a> and press CTRL+C to copy it.</p>'
                 +'<textarea readonly onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea\').select();">'+window.localStorage[window.plugin.drawTools.KEY_STORAGE]+'</textarea>'
                 +'<p>or, export as a link for the standard intel map (for non IITC users)</p>'
                 +'<input onclick="event.target.select();" type="text" size="90" value="'+stockUrl+'"/>';
+*/
+         // Export Normal draw
+        var html = ''
+          +'<p style="margin:0 0 6px;">Normal export:</p>'
+          +'<p style="margin:0 0 6px;"><a onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea#copyNorm\').select();">Select all</a> and press CTRL+C to copy it.</p>'
+          +'<textarea id="copyNorm" readonly onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea#copyNorm\').select();">'+localStorage[window.plugin.drawTools.KEY_STORAGE]+'</textarea>';
+
+        // Export draw (polygons as lines)
+        html += '<hr/>'
+          +'<p style="margin:0 0 6px;">or export with polygons as lines (not filled):</p>'
+          +'<p style="margin:0 0 6px;"><a onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea#copyEDF\').select();">Select all</a> and press CTRL+C to copy it.</p>'
+          +'<textarea id="copyEDF" readonly onclick="$(\'.ui-dialog-drawtoolsSet-copy textarea#copyEDF\').select();">'+window.plugin.drawTools.getDrawAsLines()+'</textarea>';
+
+        // Export for intel stock URL (only lines)
+        html += '<hr/>'
+          +'<p style="margin:0 0 6px;">or export as a link for the standard intel map (for non IITC users):</p>'
+          +'<p style="margin:0 0 6px;"><a onclick="$(this).parent().next(\'input\').select();">Select all</a> and press CTRL+C to copy it.</p>'
+          +'<input onclick="event.target.select();" type="text" size="49" value="'+stockUrl+'"/>';
+
       if (stockWarnTexts.length>0) {
         html += '<ul><li>'+stockWarnTexts.join('</li><li>')+'</li></ul>';
       }
@@ -388,6 +428,7 @@ window.plugin.drawTools.optExport = function() {
 }
 
 window.plugin.drawTools.optPaste = function() {
+//  if (merge === undefined) merge = true;   //default to true
   var promptAction = prompt('Press CTRL+V to paste (draw-tools data or stock intel URL).', '');
   promptAction = promptAction && promptAction.trim();
   if (promptAction) {
@@ -428,17 +469,26 @@ window.plugin.drawTools.optPaste = function() {
         }
 
         // all parsed OK - clear and insert
-        window.plugin.drawTools.drawnItems.clearLayers();
+        if (!window.plugin.drawTools.merge.status) {
+          window.plugin.drawTools.drawnItems.clearLayers();
+        }
         for (var i=0; i<newLines.length; i++) {
           window.plugin.drawTools.drawnItems.addLayer(newLines[i]);
         }
         runHooks('pluginDrawTools', {event: 'import'});
 
-        console.log('DRAWTOOLS: reset and imported drawn items from stock URL');
+        console.log('DRAWTOOLS: '+(window.plugin.drawTools.merge.status?'':'reset and ')+'pasted drawn items from stock URL');
         window.plugin.drawTools.optAlert('Import Successful.');
 
 
       } else {
+        if (window.plugin.drawTools.merge.status) {
+          promptAction = (typeof(
+            window.localStorage[window.plugin.drawTools.KEY_STORAGE]) !== 'undefined' &&
+            window.localStorage[window.plugin.drawTools.KEY_STORAGE].length > 4
+              ? window.localStorage[window.plugin.drawTools.KEY_STORAGE].slice(0,-1) + ',' + promptAction.slice(1)
+              : promptAction);
+        }
         var data;
           try{
             data = JSON.parse(promptAction);
@@ -455,7 +505,7 @@ window.plugin.drawTools.optPaste = function() {
         }
         window.plugin.drawTools.drawnItems.clearLayers();
         window.plugin.drawTools.import(data);
-        console.log('DRAWTOOLS: reset and imported drawn items');
+        console.log('DRAWTOOLS: '+(window.plugin.drawTools.merge.status?'':'reset and ')+'pasted drawn items');
         window.plugin.drawTools.optAlert('Import Successful.');
       }
 
@@ -473,9 +523,11 @@ window.plugin.drawTools.optImport = function() {
     .on('load',function (e) {
       try {
         var data = JSON.parse(e.reader.result);
-        window.plugin.drawTools.drawnItems.clearLayers();
+        if (!window.plugin.drawTools.merge.status) {
+          window.plugin.drawTools.drawnItems.clearLayers();
+        }
         window.plugin.drawTools.import(data);
-        console.log('DRAWTOOLS: reset and imported drawn tiems');
+        console.log('DRAWTOOLS: '+(window.plugin.drawTools.merge.status?'':'reset and ')+'imported drawn items');
         window.plugin.drawTools.optAlert('Import Successful.');
 
         // to write back the data to localStorage
@@ -654,7 +706,7 @@ window.plugin.drawTools.boot = function() {
 
   $('head').append('<style>' +
         '.drawtoolsSetbox > a { display:block; color:#ffce00; border:1px solid #ffce00; padding:3px 0; margin:10px auto; width:80%; text-align:center; background:rgba(8,48,78,.9); }'+
-        '.ui-dialog-drawtoolsSet-copy textarea { width:96%; height:250px; resize:vertical; }'+
+        '.ui-dialog-drawtoolsSet-copy textarea { width:96%; height:100px; resize:vertical; }'+
         '</style>');
 
 }
@@ -710,9 +762,111 @@ window.plugin.drawTools.mpe.initMPE = function(){
   });
 }
 
+// EXPORT (POLYS AS LINES)
+// ---------------------------------------------------------------------------------
+window.plugin.drawTools.getDrawAsLines = function(){
+  var rawDraw = JSON.parse(window.localStorage[window.plugin.drawTools.KEY_STORAGE]);
+  var draw = [];
+
+  for(i in rawDraw){
+    var elemDraw = rawDraw[i];
+
+    if(elemDraw.type === 'polygon'){
+      var convElemDraw = {};
+      convElemDraw.color = elemDraw.color;
+      convElemDraw.type = 'polyline';
+      convElemDraw.latLngs = [];
+
+      var v = elemDraw.latLngs.length;
+      for(j in elemDraw.latLngs){
+        var ll = elemDraw.latLngs[j];
+        convElemDraw.latLngs.push(ll);
+      }
+      convElemDraw.latLngs.push(elemDraw.latLngs[0]);
+
+      draw.push(convElemDraw);
+    }else{
+      draw.push(elemDraw);
+    }
+  }
+
+  return JSON.stringify(draw);
+}
+
+// ---------------------------------------------------------------------------------
+// EMPTY POLYGONS (EMPTY DRAWN FIELDS)
+// ---------------------------------------------------------------------------------
+window.plugin.drawTools.edf = {};
+window.plugin.drawTools.edf.storage = {};
+window.plugin.drawTools.edf.draw = {};
+window.plugin.drawTools.edf.obj = {};
+window.plugin.drawTools.edf.action = {};
+window.plugin.drawTools.edf.ui = {};
+
+window.plugin.drawTools.edf.boot = function(){
+  window.addHook('pluginDrawTools', window.plugin.drawTools.edf.hookManagement);
+  window.addHook('iitcLoaded', function(){
+    if(window.plugin.drawTools.edf.obj.status){
+      window.plugin.drawTools.edf.draw.toggleOpacityOpt();
+      window.plugin.drawTools.edf.draw.clearAndDraw();
+    }
+  });
+};
+
+window.plugin.drawTools.edf.obj.status = false;
+window.plugin.drawTools.edf.obj.toggle = function(){
+  var status = window.plugin.drawTools.edf.obj.status;
+  status = Boolean(!status);
+  window.plugin.drawTools.edf.obj.status = status;
+}
+window.plugin.drawTools.edf.draw.toggleOpacityOpt = function(){
+  if(window.plugin.drawTools.edf.obj.status){
+    window.plugin.drawTools.polygonOptions.fillOpacity = 0.0;
+  }else{
+    window.plugin.drawTools.polygonOptions.fillOpacity = 0.2;
+  }
+}
+window.plugin.drawTools.edf.draw.clearAndDraw = function(){
+  window.plugin.drawTools.drawnItems.clearLayers();
+  window.plugin.drawTools.load();
+  console.log('DRAWTOOLS: reset all drawn items');
+}
+
+window.plugin.drawTools.edf.action.toggle = function(){
+  window.plugin.drawTools.edf.obj.toggle();
+  window.plugin.drawTools.edf.draw.toggleOpacityOpt();
+  window.plugin.drawTools.edf.draw.clearAndDraw();
+}
+
+window.plugin.drawTools.edf.hookManagement = function(data){
+  if(data.event === 'openOpt'){
+  }else if(data.event == 'layerCreated'){
+    if(window.plugin.drawTools.edf.obj.status){
+      //    window.plugin.drawTools.edf.draw.toggleOpacityOpt(); // disabled by Zaso
+      window.plugin.drawTools.edf.draw.clearAndDraw();
+    }
+  }
+}
+
+window.plugin.drawTools.setupCSS = function(){
+	$("<style>").prop("type", "text/css").html(''
+		+'.leaflet-bar{box-shadow:0 1px 5px rgba(0,0,0,.65);}'
+		+'.leaflet-draw .leaflet-draw-section .leaflet-bar{box-shadow:none;}'
+		+'.leaflet-draw{box-shadow:0 1px 5px rgba(0,0,0,.65);border-radius:4px;}'
+
+		+'.leaflet-draw .leaflet-draw-section .leaflet-bar.leaflet-draw-toolbar-top a:last-child{border-bottom:2px solid #999;}'
+		+'.leaflet-draw .leaflet-draw-section .leaflet-bar a{border-radius:0;}'
+
+		+'.leaflet-draw .leaflet-draw-section .leaflet-bar{border-radius:0 0 4px 4px;overflow:hidden;margin-top:0;}'
+		+'.leaflet-draw .leaflet-draw-section .leaflet-bar.leaflet-draw-toolbar-top{border-radius:4px 4px 0 0;}'
+	).appendTo("head");
+}
+
 function setup () {
-  loadExternals();                              // initialize leaflet
-  window.plugin.drawTools.boot();               // initialize drawtools
+  loadExternals();
+  window.plugin.drawTools.boot();
+  window.plugin.drawTools.setupCSS();
+  window.plugin.drawTools.edf.boot();
   window.plugin.drawTools.mpe.boot();           // register to MPE if available
 }
 
diff --git a/plugins/sync.js b/plugins/sync.js
index 8e75d0ccd..4bd85e313 100644
--- a/plugins/sync.js
+++ b/plugins/sync.js
@@ -1,7 +1,7 @@
 // @author         xelio
 // @name           Sync
 // @category       Misc
-// @version        0.4.1
+// @version        0.4.2
 // @description    Sync data between clients via Google Drive API. Only syncs data from specific plugins (currently: Keys, Bookmarks, Uniques). Sign in via the 'Sync' link. Data is synchronized every 3 minutes.
 
 
@@ -35,7 +35,7 @@ window.plugin.sync.authorizer = null;
 window.plugin.sync.registeredPluginsFields = null;
 window.plugin.sync.logger = null;
 
-window.plugin.sync.checkInterval = 3 * 60 * 1000; // update data every 3 minutes
+window.plugin.sync.checkInterval = 3 * 60 * 1000;   // update data every 3 minutes
 
 // Other plugin call this function to push update to Google Drive API
 // example:
@@ -58,21 +58,22 @@ window.plugin.sync.updateMap = function(pluginName, fieldName, keyArray) {
 //
 // initializedCallback function format: function(pluginName, fieldName)
 // initializedCallback will be fired when the storage finished initialize and good to use
-window.plugin.sync.registerMapForSync = function(pluginName, fieldName, callback, initializedCallback) {
+window.plugin.sync.registerMapForSync = function(pluginName, fieldName, updateCallback, initializedCallback) {
   var options, registeredMap;
   options = {'pluginName': pluginName,
                'fieldName': fieldName,
-               'callback': callback,
+               'callback': updateCallback,
                'initializedCallback': initializedCallback,
                'authorizer': plugin.sync.authorizer,
                'uuid': plugin.sync.uuid};
-  registeredMap = new plugin.sync.RegisteredMap(options);
-  plugin.sync.registeredPluginsFields.add(registeredMap);
+  registeredMap = new plugin.sync.RegisteredMap(options);   // create a new datasructure 
+                                                            // for the calling plugin and
+  plugin.sync.registeredPluginsFields.add(registeredMap);   // add it to the main structure
 };
 
 
 
-//// RegisteredMap
+//// RegisteredMap *************************************************************************
 // Create a file named pluginName[fieldName] in folder specified by authorizer
 // The file use as document with JSON to store the data and uuid of last update client
 // callback will called when any local/remote update happen
@@ -83,73 +84,93 @@ window.plugin.sync.RegisteredMap = function(options) {
   this.callback = options['callback'];
   this.initializedCallback = options['initializedCallback'];
   this.authorizer = options['authorizer'];
-  this.uuid = options['uuid'];
+
+  this.uuid = options['uuid'];                              // local UUID
+  this.lastUpdateUUID = null;                               // the UUID that we think
+                                                            // did last Update (can be us)
+  this.remoteUUID = null;                                   // the remote UUID in drive
 
   this.intervalID = null;
   this.map = null;
-  this.lastUpdateUUID = null;
   this.dataStorage = null;
 
   this.forceFileSearch = false;
   this.initializing = false;
   this.initialized = false;
   this.failed = false;
-
+  this.doSync = 'remote';                                   // normal 'sync'
+                                                            // 'no' sync needed
+                                                            // force 'remote' (1st sync)
+                                                            // force 'local'
+                                                            // sync is on 'stop'
+  
   this.initialize = this.initialize.bind(this);
   this.loadDocument = this.loadDocument.bind(this);
 };
 
+// this function updates the registered map (copy of the plugin's data)
+// and finally saves it to google drive
+// it includes this clients UUID so that a reading client can see if 
+// if an other clinet did the last update or if it was this client
 window.plugin.sync.RegisteredMap.prototype.updateMap = function(keyArray) {
   var _this = this;
   try {
-    this.lastUpdateUUID = this.uuid;
-
-    $.each(keyArray, function(ind, key) {
-      var value = window.plugin[_this.pluginName][_this.fieldName][key];
-      if(typeof(value) !== 'undefined') {
-        _this.map[key] = value;
-      } else {
-        delete _this.map[key];
+    this.lastUpdateUUID = this.uuid;                        // use this clients uuid
+    $.each(keyArray, function(ind, key) {                   // find all changed elements from the array
+      var value = window.plugin[_this.pluginName][_this.fieldName][key]; 
+      if(typeof(value) !== 'undefined') {                  
+        _this.map[key] = value;                             // replace element in the array
+      } else {                                              // or
+        delete _this.map[key];                              // remove it from the array
       }
     });
   } finally {
-    _this.dataStorage.saveFile(_this.prepareFileData());
+    _this.dataStorage.saveFile(_this.prepareFileData());    // save data and UUID to drive
   }
 };
 
-window.plugin.sync.RegisteredMap.prototype.isUpdatedByOthers = function() {
-  var remoteUUID = this.lastUpdateUUID.toString();
-  return (remoteUUID !== '') && (remoteUUID !== this.uuid);
-};
-
+// concatenate a the filename for the drive "pluginName[fieldName]"
 window.plugin.sync.RegisteredMap.prototype.getFileName = function() {
   return this.pluginName + '[' + this.fieldName + ']'
 };
 
+// initialize access to the sync-file on drive
+//   callback (optional) - to be performed on success
 window.plugin.sync.RegisteredMap.prototype.initFile = function(callback) {
   var assignIdCallback, failedCallback, _this;
-  _this = this;
+  _this = this;                                             // have _this point to this Object
 
-  assignIdCallback = function(id) {
+  // file access granted, perform callback-function
+  assignIdCallback = function(id) {                         // where does this id come from?
     _this.forceFileSearch = false;
-    if(callback) callback();
+    if(callback) callback();                                // do the callback passed to .initfile
   };
 
+  // file access not possible
   failedCallback = function(resp) {
     _this.initializing = false;
     _this.failed = true;
     plugin.sync.logger.log(_this.getFileName(), 'Could not create file. If this problem persist, delete this file in IITC-SYNC-DATA-V3 in your Google Drive and try again.');
   };
 
-  this.dataStorage = new plugin.sync.DataManager({'fileName': this.getFileName(),
-                                                    'description': 'IITC plugin data for ' + this.getFileName()});
-  this.dataStorage.initialize(this.forceFileSearch, assignIdCallback, failedCallback);
+  this.dataStorage = new plugin.sync.DataManager(           // create a new dataStorage with
+    { 
+      'fileName': this.getFileName(),                       
+      'description': 'IITC plugin data for ' + this.getFileName()
+    }
+  );
+  
+  this.dataStorage.initialize(                              // initalize the dataStorage to gain 
+    this.forceFileSearch,                                   // find the related file on drive
+    assignIdCallback,                                       // onSuccess: 
+    failedCallback                                          // onFailed: 
+  );
 };
 
 window.plugin.sync.RegisteredMap.prototype.initialize = function(callback) {
   this.initFile(this.loadDocument);
 };
-
+// prepend UUID to data
 window.plugin.sync.RegisteredMap.prototype.prepareFileData = function() {
   return {'map': this.map, 'last-update-uuid': this.uuid};
 };
@@ -162,46 +183,109 @@ window.plugin.sync.RegisteredMap.prototype.loadDocument = function(callback) {
   // this function called when the document is created first time
   // and the JSON file is populated with data in plugin field
   initializeFile = function() {
-    _this.map = {};
+    _this.map = {};                                         // create an empty map
 
-    // Init the map values if this map is first created
+    // copy all elements from the plugin's data to the new map
     $.each(window.plugin[_this.pluginName][_this.fieldName], function(key, val) {
       _this.map[key] = val;
     });
 
-    _this.dataStorage.saveFile(_this.prepareFileData());
+    _this.dataStorage.saveFile(_this.prepareFileData());    // save the map to drive
     plugin.sync.logger.log(_this.getFileName(), 'Model initialized');
     setTimeout(function() {_this.loadDocument();}, window.plugin.sync.checkInterval);
   };
 
-  // this function called when the document is loaded
-  // update local data if the document is updated by other
-  // and adding a timer to further check for updates
+  // this function gets called when the document is loaded
   onFileLoaded = function(data) {
-    _this.map = data['map'];
-    _this.lastUpdateUUID = data['last-update-uuid'];
-
-    if (!_this.intervalID) {
-      _this.intervalID = setInterval(function() {
-        _this.loadDocument();
-      }, window.plugin.sync.checkInterval);
+    
+    if (!_this.intervalID) {                        // if the DL-interval is not set
+      _this.intervalID = setInterval(function() {   // create a new timer to load
+        _this.loadDocument();                       // the file from drive
+      }, window.plugin.sync.checkInterval);         // every <checkInterval> ms
     }
 
-    // Replace local value if data is changed by others
-    if(_this.isUpdatedByOthers()) {
-      plugin.sync.logger.log(_this.getFileName(), 'Updated by others, replacing content');
-      window.plugin[_this.pluginName][_this.fieldName] = {};
-      $.each(_this.map, function(key, value) {
-        window.plugin[_this.pluginName][_this.fieldName][key] = _this.map[key];
+    /* Sync only checks the drive every 3 mins. But changes to local data get pushed
+       immediately. Two or more clients that do changes might might store data, that the 
+       other is not aware of. We are trying to identify crititcal changes. Following 
+       situations have been identified and should be coverd by the logic:
+       
+       Status-table:
+       0: init, first start, always load from remote
+       1: lastUUID and remoteUUID show the same UUID, load from remote
+       2: lastUUID and remoteUUID show local UUID, no load needed
+       3: lastUUID and remoteUUID show different, not local UUIDs, load remote
+       4: lastUUID is local and remoteUIID is different, CONFLICT! Stop sync and ask user
+    */
+    _this.remoteUUID = data['last-update-uuid'];    // get the UUID of the data on drive 
+// -----------------------------------------------------------------------------------------    
+    // the initial value for doSync is 'remote', so initially loading from drive 
+    if (_this.doSync == 'sync') {
+      let conflict = true;                                   // 
+      // check for conflict
+      if (_this.remoteUUID == _this.lastUpdateUUID) {       // last Update was done on drive
+        conflict = false;                                   // so there is not a conflict
+      }; 
+      if (_this.remoteUUID != _this.lastUpdateUUID &&       // 3rd client modified the drive
+          _this.lastUpdateUUID != _this.uuid) {
+        // maybe issue a warning
+        console.log ('SYNC detected a 3rd client that modified the drive');
+        conflict = false;                                   // but not a conflict here
+      };
+      
+      if (conflict) {                                       // some other client changed the
+        _this.doSync = 'stop';                              // data on the drive, after we
+                                                            // did a change. So we need
+        _this.conflictHandler();                            // to stop sync and ask the user
+        plugin.sync.logger.log(_this.getFileName(), 'SYNC detected a conflict caused by '+ _this.lastRemoteUUID); 
+      } else {                                              // ELSE no conflict found: 
+        if (_this.remoteUUID == _this.uuid) {               // local data still is on drive?
+          _this.doSync = 'sync';                            // no need to do anything
+        } else {                                            // otherwise
+          _this.doSync = 'remote';                          // load remote data 
+        };                                                  // (it might have changed)
+      };      
+    };
+// -----------------------------------------------------------------------------------------    
+    if (_this.doSync == 'remote') {
+      // load the remote data to the plugin's dataobject
+      _this.lastUpdateUUID = _this.remoteUUID;      // remember last client on drive
+      _this.map = data['map'];                      // map from the loaded data
+
+      window.plugin[_this.pluginName][_this.fieldName] = {};// clear the plugin's dataobject
+      $.each(_this.map, function(key, value) {      // fill the dataobject with data from drive
+        window.plugin[_this.pluginName][_this.fieldName][key] = _this.map[key]; 
       });
-      if(_this.callback) _this.callback(_this.pluginName, _this.fieldName, null, true);
-    }
 
-    _this.initialized = true;
-    _this.initializing = false;
-    plugin.sync.logger.log(_this.getFileName(), 'Data loaded');
-    if(_this.callback) _this.callback();
-    if(_this.initializedCallback) _this.initializedCallback(_this.pluginName, _this.fieldName);
+      // execute the callback functions             
+      if(_this.callback) _this.callback(            // execute the callback functions with
+        _this.pluginName,                           //    pluginName
+        _this.fieldName,                            //    fieldName
+        null,                                       //    null (for backwards compatibility)
+        true                                        //    true = full file load from Drive
+      );
+    
+      if (_this.initializing) {
+        _this.initialized = true;                   // connection to drive is "initalized"
+        _this.initializing = false;                 // remove semaphore
+        if(_this.initializedCallback) _this.initializedCallback( 
+          _this.pluginName, 
+          _this.fieldName
+        );
+      }
+      plugin.sync.logger.log(_this.getFileName(), 'Data loaded from: '+ _this.lastUpdateUUID); 
+      _this.doSync = 'sync';                        // return to normal sync
+    };
+// -----------------------------------------------------------------------------------------    
+    if (_this.doSync == 'local') {                  // User decided for 'local' data.
+      _this.lastUpdateUUID = _this.uuid;            // 
+      _this.updateMap({});                          // push local data to drive
+      _this.doSync = 'sync';                        // resume normal sync
+    };
+// -----------------------------------------------------------------------------------------     
+    if (_this.doSync == 'stop') {
+      // do nothing
+      console.log('SYNC stopped synching data for plugin '+_this.pluginName);
+    };
   };
 
   // Stop the sync if any error occur and try to re-authorize
@@ -216,30 +300,75 @@ window.plugin.sync.RegisteredMap.prototype.loadDocument = function(callback) {
     plugin.sync.logger.log(_this.getFileName(), errorMessage);
     if(isNetworkError === true) {
       setTimeout(function() {_this.authorizer.authorize();}, 50*1000);
-    } else if(e.status === 401) { // Unauthorized
+    } else if(e.status === 401) {                   // Unauthorized
       _this.authorizer.authorize();
-    } else if(e.status === 404) { // Not found
+    } else if(e.status === 404) {                   // Not found
       _this.forceFileSearch = true;
       _this.initFile();
       setTimeout(function() {_this.loadDocument();}, window.plugin.sync.checkInterval);
     }
   };
 
+  // finally execute readFile
   this.dataStorage.readFile(initializeFile, onFileLoaded, handleError);
 };
+
+// conflict handler to decide between remote or local data
+//   results: 'remote', 'local', 'stop'
+window.plugin.sync.RegisteredMap.prototype.conflictHandler = function () {
+  var _this;
+  _this = this;
+  
+  window.dialog ({
+    title: "SYNC Conflict Handling",
+    html: "<div>SYNC found a conflict. The remote data stored on the drive "
+        + "was changed while you did local changes . "
+        + "Please decide which data shall be used. <br>"
+        + "Your decission will overwrite the other changes. "
+        + "It is impossible to merge the data!</div><br>"
+        + "",
+    buttons: [
+      { text: "remote",
+        click: function() {
+          _this.doSync = 'remote';
+          $( this ).dialog( "close" );
+        }
+      },
+      { text: "local",
+        click: function() {
+          _this.doSync = 'local';
+          $( this ).dialog( "close" );
+        }
+      },
+      { text: "STOP SYNC",
+        click: function() {
+          _this.doSync = 'stop';
+          $( this ).dialog( "close" );
+        }
+      }
+    ],
+    closeCallback: function() {
+       _this.loadDocument(); 
+    },
+    maxHeight: 300
+  });
+  
+};
+
+
 //// end RegisteredMap
 
 
 
 
-//// RegisteredPluginsFields
+//// RegisteredPluginsFields ***************************************************************
 // Store RegisteredMap and handle initialization of RegisteredMap
 window.plugin.sync.RegisteredPluginsFields = function(options) {
-  this.authorizer = options['authorizer'];
+  this.authorizer = options['authorizer'];                  // 
   this.pluginsfields = {};
-  this.waitingInitialize = {};
+  this.waitingInitialize = {};                              // queue for fields that need initialization
 
-  this.anyFail = false;
+  this.anyFail = false;                                     // anything failed ?
 
   this.initializeRegistered = this.initializeRegistered.bind(this);
   this.cleanWaitingInitialize = this.cleanWaitingInitialize.bind(this);
@@ -259,7 +388,7 @@ window.plugin.sync.RegisteredPluginsFields.prototype.add = function(registeredMa
   this.pluginsfields[pluginName][fieldName] = registeredMap;
   this.waitingInitialize[registeredMap.getFileName()] = registeredMap;
 
-  this.initializeWorker();
+  this.initializeWorker();                                  // start the regular check on drive
 };
 
 window.plugin.sync.RegisteredPluginsFields.prototype.get = function(pluginName, fieldName) {
@@ -267,40 +396,45 @@ window.plugin.sync.RegisteredPluginsFields.prototype.get = function(pluginName,
   return this.pluginsfields[pluginName][fieldName];
 };
 
+// try to initialize remaining entries in the queue
 window.plugin.sync.RegisteredPluginsFields.prototype.initializeRegistered = function() {
   var _this = this;
   if(this.authorizer.isAuthed()) {
     $.each(this.waitingInitialize, function(key, map) {
-      if(!map.initializing && !map.initialized) {
-        map.initialize(_this.cleanWaitingInitialize);
+      if(!map.initializing && !map.initialized) {           // if not alraedy in process
+        map.initialize(_this.cleanWaitingInitialize);       // initialize the map
       }
     });
   }
 };
 
+// cleanup the initialization queue
 window.plugin.sync.RegisteredPluginsFields.prototype.cleanWaitingInitialize = function() {
   var newWaitingInitialize, _this;
   _this = this;
 
   newWaitingInitialize = {};
-  $.each(this.waitingInitialize, function(key,map) {
-    if(map.failed) _this.anyFail = true;
-    if(map.initialized || map.failed) return true;
-    newWaitingInitialize[map.getFileName()] = map;
+  $.each(this.waitingInitialize, function(key,map) {        // test queue if all data is ready
+    if(map.failed) _this.anyFail = true;                    // at least one failed ?
+    if(map.initialized || map.failed) return true;          // next map
+    newWaitingInitialize[map.getFileName()] = map;          // copy remaining maps
   });
-  this.waitingInitialize = newWaitingInitialize;
+  this.waitingInitialize = newWaitingInitialize;            // to the queue
 };
 
+// Try to initialize all registerd fields with a timeout of 10 sec
 window.plugin.sync.RegisteredPluginsFields.prototype.initializeWorker = function() {
   var _this = this;
 
-  this.cleanWaitingInitialize();
-  plugin.sync.toggleDialogLink();
-  this.initializeRegistered();
-
-  clearTimeout(this.timer);
-  if(Object.keys(this.waitingInitialize).length > 0) {
-    this.timer = setTimeout(function() {_this.initializeWorker()}, 10000);
+  this.cleanWaitingInitialize();                            // clean up the initialization queue
+  plugin.sync.toggleDialogLink();                           // set the color of the menu entry
+  this.initializeRegistered();                              // try initialize remaining entries 
+                                                            //   in the queue
+  clearTimeout(this.timer);                                 // reset the timer
+  if(Object.keys(this.waitingInitialize).length > 0) {      // if queue still not empty
+    this.timer = setTimeout(
+      function() {_this.initializeWorker()}, 10000          // retry in 10 sec
+    );
   }
 };
 //// end RegisteredPluginsFields
@@ -308,13 +442,17 @@ window.plugin.sync.RegisteredPluginsFields.prototype.initializeWorker = function
 
 
 
-//// DataManager
+//// DataManager ***************************************************************************
+// is providing the actual save and load routines as well as initializing folder and files
+// if they do not exist.
 //
 // assignIdCallback function format: function(id)
 // allow you to assign the file/folder id elsewhere
 //
 // failedCallback function format: function()
 // call when the file/folder couldn't create
+//
+// options = {'fileName':string ,'description':string}
 window.plugin.sync.DataManager = function(options) {
   this.fileName = options['fileName'];
   this.description = options['description'];
@@ -371,19 +509,19 @@ window.plugin.sync.DataManager.prototype.initFile = function(assignIdCallback, f
 
   createCallback = function(response) {
     if(response.result.id) {
-      handleFileId(response.result.id); // file created
+      handleFileId(response.result.id);                     // file created
     } else {
-      handleFailed(response) // could not create file
+      handleFailed(response)                                // could not create file
     }
   };
 
   searchCallback = function(resp) {
     if(resp.result.files.length !== 0) {
-      handleFileId(resp.result.files[0].id);// file found
+      handleFileId(resp.result.files[0].id);                // file found
     } else if(resp.result.files.length === 0) {
-      _this.createFile(createCallback); // file not found, create file
+      _this.createFile(createCallback);                     // file not found, create file
     } else {
-      handleFailed(resp); // Error
+      handleFailed(resp);                                   // Error
     }
   };
   this.searchFile(searchCallback);
@@ -457,37 +595,63 @@ window.plugin.sync.DataManager.prototype.createFile = function(callback) {
   });
 };
 
-window.plugin.sync.DataManager.prototype.readFile = function(needInitializeFileCallback, onFileLoadedCallback, handleError) {
+// readFile
+//   needInitializedFileCallback - function to handle no response. 
+//                                 result usually the requested data
+//   onFileLoadedCallback        - function to handle success  
+//   handleError                 - function to handle Error
+window.plugin.sync.DataManager.prototype.readFile = function(needInitializeFileCallback,
+           onFileLoadedCallback,
+           handleError)   {
   var _this = this;
 
-  gapi.client.load('drive', 'v3').then(function () {
-    gapi.client.drive.files.get({ fileId: _this.fileId, alt: 'media' })
-    .then(function (response) {
-      var res = response.result;
-      if (res) {
-        onFileLoadedCallback(res);
-      } else {
-        needInitializeFileCallback();
-      }
-    },function(reason){
+  // gapi.client.load is a depricated routine
+  //   .then(opt_onFulfilled, opt_onRejected)
+  gapi.client.load('drive', 'v3').then(             // depricated, needs replacement
+    // gapi.client.drive.files.get
+    //   .then(opt_onFulfilled, opt_onRejected)
+    function ()                                     // opt_onFulfilled for .load
+      {gapi.client.drive.files.get({                // Gets a file's metadata by ID
+        fileId: _this.fileId,                       //   fileId
+        alt: 'media'                                //   respond with the file contents in 
+                                                    //   the response body
+      }) 
+      .then(
+        function (response) {                       // opt_onFulfilled for drive.files.get
+          var res = response.result;
+          if (res) {
+            onFileLoadedCallback(res);              // perform provided routine
+          } else {
+            needInitializeFileCallback();           // no result (data) returned
+          }
+        },
+        function(reason){                           // opt_onRejected for drive.files.get
+          handleError(reason);
+        }
+      );
+    },
+    function(reason){                               // opt_onRejected for .load
       handleError(reason);
-    });
-  },function(reason){
-    handleError(reason);
-  });
+    }
+  );
 };
 
+// saveFile
+//   data - the data to be saved
 window.plugin.sync.DataManager.prototype.saveFile = function(data) {
   var _this = this;
-
-  gapi.client.load('drive', 'v3').then(function () {
-    gapi.client.request({
-      path: '/upload/drive/v3/files/'+_this.fileId,
-      method: 'PATCH',
-      params: { uploadType: 'media' },
-      body: JSON.stringify(data)
-    }).execute();
-  });
+  
+  gapi.client.load('drive', 'v3').then(
+    function () {        
+      gapi.client.request({
+        path: '/upload/drive/v3/files/'+_this.fileId,
+        method: 'PATCH',                                    // why patch? 
+        params: { uploadType: 'media' },
+        body: JSON.stringify(data)
+      }).execute();                                         // write (patch) the file on drive
+    }
+                                                            // no errorhandling here?!
+  );
 };
 
 window.plugin.sync.DataManager.prototype.searchFile = function(callback) {
@@ -523,8 +687,11 @@ window.plugin.sync.DataManager.prototype.loadFileId = function() {
 
 
 
-//// Authorizer
+//// Authorizer ****************************************************************************
 // authorize user's google account
+// options: (type: object)
+//    'authCallback' - array of functions to execute after sucessfull authorization
+//    
 window.plugin.sync.Authorizer = function(options) {
   this.authCallback = options['authCallback'];
   this.authorizing = false;
@@ -533,22 +700,27 @@ window.plugin.sync.Authorizer = function(options) {
   this.isAuthorizing = this.isAuthorizing.bind(this);
   this.authorize = this.authorize.bind(this);
 };
-
+// values that are static at the moment
 window.plugin.sync.Authorizer.prototype.CLIENT_ID = '1099227387115-osrmhfh1i6dto7v7npk4dcpog1cnljtb.apps.googleusercontent.com';
 window.plugin.sync.Authorizer.prototype.SCOPES = 'https://www.googleapis.com/auth/drive.file';
 
+// method to tell if SYNC is authorized
 window.plugin.sync.Authorizer.prototype.isAuthed = function() {
   return this.authorized;
 };
 
+// method to tell if authorization is in progress
 window.plugin.sync.Authorizer.prototype.isAuthorizing = function() {
   return this.authorizing;
 };
+
+// (external) method to add an other authCallback function 
 window.plugin.sync.Authorizer.prototype.addAuthCallback = function(callback) {
   if(typeof(this.authCallback) === 'function') this.authCallback = [this.authCallback];
   this.authCallback.push(callback);
 };
 
+// (internal) function that will execute all enregistered authCallback functions 
 window.plugin.sync.Authorizer.prototype.authComplete = function() {
   this.authorizing = false;
   if(this.authCallback) {
@@ -561,6 +733,9 @@ window.plugin.sync.Authorizer.prototype.authComplete = function() {
   }
 };
 
+// (external) function that will initiate the authorization
+// redirect: (type: boolean) 
+//   true: call from dialog
 window.plugin.sync.Authorizer.prototype.authorize = function() {
   this.authorizing = true;
   this.authorized = false;
@@ -606,7 +781,7 @@ window.plugin.sync.Authorizer.prototype.authorize = function() {
 
 
 
-//// Logger
+//// Logger ********************************************************************************
 window.plugin.sync.Logger = function(options) {
   this.logLimit = options['logLimit'];
   this.logUpdateCallback = options['logUpdateCallback'];
@@ -633,7 +808,7 @@ window.plugin.sync.Logger.prototype.getLogs = function() {
   var allLogs = '';
   Object.keys(this.logs).forEach((key) => {
     var value = this.logs[key];
-    allLogs += '<div class="sync-log-block"><p class="sync-log-file">'+key+':</p><p class="sync-log-message">' + value.message+' ('+value.time.toLocaleTimeString()+')</p></div>';
+    allLogs += '<div class="sync-log-block"><p class="sync-log-file">'+key+':</p><p class="sync-log-message">' + value.message+' ('+value.time.toLocaleTimeString("en-GB")+')</p></div>';
   });
 
   return allLogs;
@@ -644,7 +819,7 @@ window.plugin.sync.Logger.prototype.getLogs = function() {
 
 
 
-
+// generate a GUID that identifies this client
 // http://stackoverflow.com/a/8809472/2322660
 // http://stackoverflow.com/a/7221797/2322660
 // With format fixing: xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx where y in [8,9,a,b]
@@ -671,6 +846,7 @@ window.plugin.sync.generateUUID = function() {
   }
 };
 
+// save the Drive file-ID that relates to [pluginname].[field]
 window.plugin.sync.storeLocal = function(mapping) {
   if(typeof(plugin.sync[mapping.field]) !== 'undefined' && plugin.sync[mapping.field] !== null) {
     localStorage[mapping.key] = JSON.stringify(plugin.sync[mapping.field]);
@@ -679,6 +855,7 @@ window.plugin.sync.storeLocal = function(mapping) {
   }
 };
 
+// load the Drive file-ID that relates to [pluginname].[field]
 window.plugin.sync.loadLocal = function(mapping) {
   var objectJSON = localStorage[mapping.key];
   if(!objectJSON) return;
@@ -694,6 +871,7 @@ window.plugin.sync.loadLocal = function(mapping) {
                           : obj;
 };
 
+//load a previously generated UUID (or generate a new one)
 window.plugin.sync.loadUUID = function() {
   plugin.sync.loadLocal(plugin.sync.KEY_UUID);
   if(!plugin.sync.uuid) {
@@ -702,10 +880,12 @@ window.plugin.sync.loadUUID = function() {
   }
 };
 
+
 window.plugin.sync.updateLog = function(messages) {
   $('#sync-log').html(messages);
 };
 
+// AuthButon that shows IN the dialog
 window.plugin.sync.toggleAuthButton = function() {
   var authed, authorizing;
   authed = plugin.sync.authorizer.isAuthed();
@@ -717,6 +897,7 @@ window.plugin.sync.toggleAuthButton = function() {
   $('#sync-authButton').toggleClass('sync-authButton-dimmed', authed || authorizing);
 };
 
+// Sync menuitem in the toolbox
 window.plugin.sync.toggleDialogLink = function() {
   var authed, anyFail;
   authed = plugin.sync.authorizer.isAuthed();
@@ -725,6 +906,7 @@ window.plugin.sync.toggleDialogLink = function() {
   $('#sync-show-dialog').toggleClass('sync-show-dialog-error', !authed || anyFail);
 };
 
+// open the dialog
 window.plugin.sync.showDialog = function() {
   window.dialog({html: plugin.sync.dialogHTML, title: 'Sync', modal: true, id: 'sync-setting'});
   plugin.sync.toggleAuthButton();
@@ -732,6 +914,7 @@ window.plugin.sync.showDialog = function() {
   plugin.sync.updateLog(plugin.sync.logger.getLogs());
 };
 
+// create the dialog
 window.plugin.sync.setupDialog = function() {
   plugin.sync.dialogHTML = '<div id="sync-dialog">'
                          + '<button id="sync-authButton" class="sync-authButton-dimmed" '
@@ -742,6 +925,7 @@ window.plugin.sync.setupDialog = function() {
   $('#toolbox').append('<a id="sync-show-dialog" onclick="window.plugin.sync.showDialog();">Sync</a> ');
 };
 
+// add some CSS for the changing buttons
 window.plugin.sync.setupCSS = function() {
   $("<style>")
     .prop("type", "text/css")
@@ -774,23 +958,32 @@ window.plugin.sync.setupCSS = function() {
   .appendTo("head");
 };
 
+////////////////////////////////////////////////////
+//// Main **********************************************************************************
 var setup = function() {
-  window.plugin.sync.logger = new plugin.sync.Logger({'logLimit':10, 'logUpdateCallback': plugin.sync.updateLog});
+  window.plugin.sync.logger = new plugin.sync.Logger(
+    {'logLimit':10, 'logUpdateCallback': plugin.sync.updateLog}
+  );
   window.plugin.sync.loadUUID();
   window.plugin.sync.setupCSS();
   window.plugin.sync.setupDialog();
-
-  window.plugin.sync.authorizer = new window.plugin.sync.Authorizer({
-    'authCallback': [plugin.sync.toggleAuthButton, plugin.sync.toggleDialogLink]
-  });
+// create an authorizer structure
+  window.plugin.sync.authorizer = new window.plugin.sync.Authorizer(
+    {
+    'authCallback': [plugin.sync.toggleAuthButton,          // functions to execute after 
+                     plugin.sync.toggleDialogLink           // successfull authorization
+                    ]
+    }
+  );
+  // create base structure
   window.plugin.sync.registeredPluginsFields = new window.plugin.sync.RegisteredPluginsFields({
     'authorizer': window.plugin.sync.authorizer
   });
-
+  // load the Google API and authorize.
   var GOOGLEAPI = 'https://apis.google.com/js/api.js';
   $.getScript(GOOGLEAPI).done(function () {
     gapi.load('client:auth2', window.plugin.sync.authorizer.authorize);
   });
 };
-
+// start this plugin with high priority during IITCs boot
 setup.priority = 'high';
diff --git a/plugins/uniques.js b/plugins/uniques.js
index 672b1bef3..de0c3826b 100644
--- a/plugins/uniques.js
+++ b/plugins/uniques.js
@@ -1,9 +1,8 @@
 // @author         3ch01c
 // @name           Uniques
 // @category       Misc
-// @version        0.2.4
-// @description    Allow manual entry of portals visited/captured. Use the 'highlighter-uniques' plugin to show the uniques on the map, and 'sync' to share between multiple browsers or desktop/mobile. It will try and guess which portals you have captured from COMM/portal details, but this will not catch every case.
-
+// @version        0.3.9
+// @description    Allow manual entry of portals visited/captured, scouted or droned. Highlighters for all three help to identify new portals. Uniques uses the 'sync'-plugin to share between multiple browsers or desktop/mobile. COMM and portal details are analyzed to fill the fields automatically (but this will not catch every case).
 
 //use own namespace for plugin
 window.plugin.uniques = function() {};
@@ -13,14 +12,18 @@ window.plugin.uniques.SYNC_DELAY = 5000;
 
 // maps the JS property names to localStorage keys
 window.plugin.uniques.FIELDS = {
-	'uniques': 'plugin-uniques-data',
-	'updateQueue': 'plugin-uniques-data-queue',
-	'updatingQueue': 'plugin-uniques-data-updating-queue',
+  'uniques':       'plugin-uniques-data',
+  'updateQueue':   'plugin-uniques-data-queue',
+  'updatingQueue': 'plugin-uniques-data-updating-queue',
+  'missedLatLngs': 'plugin-uniques-missedLatLngs',
+  'parsedMsgs':    'plugin-uniques-parsedMsgs'
 };
 
 window.plugin.uniques.uniques = {};
 window.plugin.uniques.updateQueue = {};
 window.plugin.uniques.updatingQueue = {};
+window.plugin.uniques.missedLatLngs = {};
+window.plugin.uniques.parsedMsgs = {};
 
 window.plugin.uniques.enableSync = false;
 
@@ -30,543 +33,878 @@ window.plugin.uniques.contentHTML = null;
 window.plugin.uniques.isHighlightActive = false;
 
 window.plugin.uniques.onPortalDetailsUpdated = function() {
-	if(typeof(Storage) === "undefined") {
-		$('#portaldetails > .imgpreview').after(plugin.uniques.disabledMessage);
-		return;
-	}
-
-	var guid = window.selectedPortal,
-		details = portalDetail.get(guid),
-		nickname = window.PLAYER.nickname;
-	if(details) {
-		if(details.owner == nickname) {
-			//FIXME: a virus flip will set the owner of the portal, but doesn't count as a unique capture
-			plugin.uniques.updateCaptured(true);
-			// no further logic required
-		} else {
-			function installedByPlayer(entity) {
-				return entity && entity.owner == nickname;
-			}
-			
-			if(details.resonators.some(installedByPlayer) || details.mods.some(installedByPlayer)) {
-				plugin.uniques.updateVisited(true);
-			}
-		}
-	}
-
-	$('#portaldetails > .imgpreview').after(plugin.uniques.contentHTML);
-	plugin.uniques.updateCheckedAndHighlight(guid);
+  if(typeof(Storage) === "undefined") {
+    $('#portaldetails > .imgpreview').after(plugin.uniques.disabledMessage);
+    return;
+  }
+
+  var guid = window.selectedPortal,
+    details = portalDetail.get(guid),
+    nickname = window.PLAYER.nickname;
+  if(details) {
+    if(details.owner == nickname) {
+      //FIXME: a virus flip will set the owner of the portal, but doesn't count as a unique capture
+      plugin.uniques.updateCaptured(true);
+      // no further logic required
+    } else {
+      function installedByPlayer(entity) {
+        return entity && entity.owner == nickname;
+      }
+
+      if(details.resonators.some(installedByPlayer) || details.mods.some(installedByPlayer)) {
+        plugin.uniques.updateVisited(true);
+      }
+    }
+  }
+
+  $('#portaldetails > .imgpreview').after(plugin.uniques.contentHTML);
+  plugin.uniques.updateCheckedAndHighlight(guid);
 }
 
 window.plugin.uniques.onPublicChatDataAvailable = function(data) {
-	var nick = window.PLAYER.nickname;
-	data.result.forEach(function(msg) {
-		var plext = msg[2].plext,
-			markup = plext.markup;
-
-		if(plext.plextType == 'SYSTEM_BROADCAST'
-		&& markup.length==5
-		&& markup[0][0] == 'PLAYER'
-		&& markup[0][1].plain == nick
-		&& markup[1][0] == 'TEXT'
-		&& markup[1][1].plain == ' deployed an '
-		&& markup[2][0] == 'TEXT'
-		&& markup[3][0] == 'TEXT'
-		&& markup[3][1].plain == ' Resonator on '
-		&& markup[4][0] == 'PORTAL') {
-			// search for "x deployed an Ly Resonator on z"
-			var portal = markup[4][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalVisited(guid);
-		} else if(plext.plextType == 'SYSTEM_BROADCAST'
-		&& markup.length==3
-		&& markup[0][0] == 'PLAYER'
-		&& markup[0][1].plain == nick
-		&& markup[1][0] == 'TEXT'
-		&& markup[1][1].plain == ' deployed a Resonator on '
-		&& markup[2][0] == 'PORTAL') {
-			// search for "x deployed a Resonator on z"
-			var portal = markup[2][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalVisited(guid);
-		} else if(plext.plextType == 'SYSTEM_BROADCAST'
-		&& markup.length==3
-		&& markup[0][0] == 'PLAYER'
-		&& markup[0][1].plain == nick
-		&& markup[1][0] == 'TEXT'
-		&& markup[1][1].plain == ' captured '
-		&& markup[2][0] == 'PORTAL') {
-			// search for "x captured y"
-			var portal = markup[2][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalCaptured(guid);
-		} else if(plext.plextType == 'SYSTEM_BROADCAST'
-		&& markup.length==5
-		&& markup[0][0] == 'PLAYER'
-		&& markup[0][1].plain == nick
-		&& markup[1][0] == 'TEXT'
-		&& markup[1][1].plain == ' linked '
-		&& markup[2][0] == 'PORTAL'
-		&& markup[3][0] == 'TEXT'
-		&& markup[3][1].plain == ' to '
-		&& markup[4][0] == 'PORTAL') {
-			// search for "x linked y to z"
-			var portal = markup[2][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalVisited(guid);
-		} else if(plext.plextType == 'SYSTEM_NARROWCAST'
-		&& markup.length==6
-		&& markup[0][0] == 'TEXT'
-		&& markup[0][1].plain == 'Your '
-		&& markup[1][0] == 'TEXT'
-		&& markup[2][0] == 'TEXT'
-		&& markup[2][1].plain == ' Resonator on '
-		&& markup[3][0] == 'PORTAL'
-		&& markup[4][0] == 'TEXT'
-		&& markup[4][1].plain == ' was destroyed by '
-		&& markup[5][0] == 'PLAYER') {
-			// search for "Your Lx Resonator on y was destroyed by z"
-			var portal = markup[3][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalVisited(guid);
-		} else if(plext.plextType == 'SYSTEM_NARROWCAST'
-		&& markup.length==5
-		&& markup[0][0] == 'TEXT'
-		&& markup[0][1].plain == 'Your '
-		&& markup[1][0] == 'TEXT'
-		&& markup[2][0] == 'TEXT'
-		&& markup[2][1].plain == ' Resonator on '
-		&& markup[3][0] == 'PORTAL'
-		&& markup[4][0] == 'TEXT'
-		&& markup[4][1].plain == ' has decayed') {
-		    // search for "Your Lx Resonator on y has decayed"
-			var portal = markup[3][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalVisited(guid);
-		} else if(plext.plextType == 'SYSTEM_NARROWCAST'
-		&& markup.length==4
-		&& markup[0][0] == 'TEXT'
-		&& markup[0][1].plain == 'Your Portal '
-		&& markup[1][0] == 'PORTAL'
-		&& markup[2][0] == 'TEXT'
-		&& (markup[2][1].plain == ' neutralized by ' || markup[2][1].plain == ' is under attack by ')
-		&& markup[3][0] == 'PLAYER') {
-		    // search for "Your Portal x neutralized by y"
-		    // search for "Your Portal x is under attack by y"
-			var portal = markup[1][1];
-			var guid = window.findPortalGuidByPositionE6(portal.latE6, portal.lngE6);
-			if(guid) plugin.uniques.setPortalVisited(guid);
-		}
-	});
+  var nick = window.PLAYER.nickname;
+  let match = false;
+  data.result.forEach(function(msg) {
+    match = false;
+    if (!window.plugin.uniques.parsedMsgs[msg[0]]){
+      var plext = msg[2].plext,
+        markup = plext.markup;
+
+      if(plext.plextType == 'SYSTEM_BROADCAST'
+      && markup.length==5
+      && markup[0][0] == 'PLAYER'
+      && markup[0][1].plain == nick
+      && markup[1][0] == 'TEXT'
+      && markup[1][1].plain == ' deployed an '
+      && markup[2][0] == 'TEXT'
+      && markup[3][0] == 'TEXT'
+      && markup[3][1].plain == ' Resonator on '
+      && markup[4][0] == 'PORTAL') {
+        // search for "x deployed an Ly Resonator on z"
+        var portal = markup[4][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'visited');
+      } else if(plext.plextType == 'SYSTEM_BROADCAST'
+      && markup.length==3
+      && markup[0][0] == 'PLAYER'
+      && markup[0][1].plain == nick
+      && markup[1][0] == 'TEXT'
+      && markup[1][1].plain == ' deployed a Resonator on '
+      && markup[2][0] == 'PORTAL') {
+        // search for "x deployed a Resonator on z"
+        var portal = markup[2][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'visited');
+      } else if(plext.plextType == 'SYSTEM_BROADCAST'
+      && markup.length==3
+      && markup[0][0] == 'PLAYER'
+      && markup[0][1].plain == nick
+      && markup[1][0] == 'TEXT'
+      && markup[1][1].plain == ' captured '
+      && markup[2][0] == 'PORTAL') {
+        // search for "x captured y"
+        var portal = markup[2][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'captured');
+      } else if(plext.plextType == 'SYSTEM_BROADCAST'
+      && markup.length==5
+      && markup[0][0] == 'PLAYER'
+      && markup[0][1].plain == nick
+      && markup[1][0] == 'TEXT'
+      && markup[1][1].plain == ' linked '
+      && markup[2][0] == 'PORTAL'
+      && markup[3][0] == 'TEXT'
+      && markup[3][1].plain == ' to '
+      && markup[4][0] == 'PORTAL') {
+        // search for "x linked y to z"
+        var portal = markup[2][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'visited');
+      } else if(plext.plextType == 'SYSTEM_NARROWCAST'
+      && markup.length==6
+      && markup[0][0] == 'TEXT'
+      && markup[0][1].plain == 'Your '
+      && markup[1][0] == 'TEXT'
+      && markup[2][0] == 'TEXT'
+      && markup[2][1].plain == ' Resonator on '
+      && markup[3][0] == 'PORTAL'
+      && markup[4][0] == 'TEXT'
+      && markup[4][1].plain == ' was destroyed by '
+      && markup[5][0] == 'PLAYER') {
+        // search for "Your Lx Resonator on y was destroyed by z"
+        var portal = markup[3][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'visited');
+      } else if(plext.plextType == 'SYSTEM_NARROWCAST'
+      && markup.length==5
+      && markup[0][0] == 'TEXT'
+      && markup[0][1].plain == 'Your '
+      && markup[1][0] == 'TEXT'
+      && markup[2][0] == 'TEXT'
+      && markup[2][1].plain == ' Resonator on '
+      && markup[3][0] == 'PORTAL'
+      && markup[4][0] == 'TEXT'
+      && markup[4][1].plain == ' has decayed') {
+          // search for "Your Lx Resonator on y has decayed"
+        var portal = markup[3][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'visited');
+      } else if(plext.plextType == 'SYSTEM_NARROWCAST'
+      && markup.length==4
+      && markup[0][0] == 'TEXT'
+      && markup[0][1].plain == 'Your Portal '
+      && markup[1][0] == 'PORTAL'
+      && markup[2][0] == 'TEXT'
+      && (markup[2][1].plain == ' neutralized by ' || markup[2][1].plain == ' is under attack by ')
+      && markup[3][0] == 'PLAYER') {
+          // search for "Your Portal x neutralized by y"
+          // search for "Your Portal x is under attack by y"
+        var portal = markup[1][1];
+        match = true;
+        plugin.uniques.setPortalAction(portal,'visited');
+      } else if(plext.plextType == 'SYSTEM_NARROWCAST'
+        && markup.length==3
+        && markup[0][0] == 'TEXT'
+        && markup[0][1].plain == 'You claimed Scout Controller on '
+        && markup[1][0] == 'PORTAL') {
+          // search for "You claimed Scout Controller on "
+          var portal = markup[1][1];
+          match = true;
+          plugin.uniques.setPortalAction(portal,'scouted');
+      } else if(plext.plextType == 'SYSTEM_NARROWCAST'
+        && markup.length==3
+        && markup[0][0] == 'TEXT'
+        && markup[0][1].plain == 'You were displaced as Scout Controller on '
+        && markup[1][0] == 'PORTAL') {
+          // search for "You were displaced as Scout Controller on"
+          var portal = markup[1][1];
+          match = true;
+          plugin.uniques.setPortalAction(portal,'scouted');
+      }
+    }
+    if (match){
+      window.plugin.uniques.parsedMsgs[msg[0]] = msg[1];
+      window.plugin.uniques.storeLocal('parsedMsgs');
+    }
+  });
 }
 
 window.plugin.uniques.updateCheckedAndHighlight = function(guid) {
-	runHooks('pluginUniquesUpdateUniques', { guid: guid });
-
-	if (guid == window.selectedPortal) {
-
-		var uniqueInfo = plugin.uniques.uniques[guid],
-			visited = (uniqueInfo && uniqueInfo.visited) || false,
-			captured = (uniqueInfo && uniqueInfo.captured) || false;
-		$('#visited').prop('checked', visited);
-		$('#captured').prop('checked', captured);
-	}
-
-	if (window.plugin.uniques.isHighlightActive) {
-		if (portals[guid]) {
-			window.setMarkerStyle (portals[guid], guid == selectedPortal);
-		}
-	}
-}
-
-
-window.plugin.uniques.setPortalVisited = function(guid) {
-	var uniqueInfo = plugin.uniques.uniques[guid];
-	if (uniqueInfo) {
-		if(uniqueInfo.visited) return;
-
-		uniqueInfo.visited = true;
-	} else {
-		plugin.uniques.uniques[guid] = {
-			visited: true,
-			captured: false
-		};
-	}
-
-	plugin.uniques.updateCheckedAndHighlight(guid);
-	plugin.uniques.sync(guid);
+  runHooks('pluginUniquesUpdateUniques', { guid: guid });
+
+  if (guid == window.selectedPortal) {
+
+    var uniqueInfo = plugin.uniques.uniques[guid],
+      visited = (uniqueInfo && uniqueInfo.visited) || false,
+      captured = (uniqueInfo && uniqueInfo.captured) || false,
+      scouted = (uniqueInfo && uniqueInfo.scouted) || false,
+      droned = (uniqueInfo && uniqueInfo.droned) || false;
+    $('#visited').prop('checked', visited);
+    $('#captured').prop('checked', captured);
+    $('#scouted').prop('checked', scouted);
+    $('#droned').prop('checked', droned);
+  }
+
+  if (window.plugin.uniques.isHighlightActive) {
+    if (portals[guid]) {
+      window.setMarkerStyle (portals[guid], guid == selectedPortal);
+    }
+  }
 }
 
-window.plugin.uniques.setPortalCaptured = function(guid) {
-	var uniqueInfo = plugin.uniques.uniques[guid];
-	if (uniqueInfo) {
-		if(uniqueInfo.visited && uniqueInfo.captured) return;
-
-		uniqueInfo.visited = true;
-		uniqueInfo.captured = true;
-	} else {
-		plugin.uniques.uniques[guid] = {
-			visited: true,
-			captured: true
-		};
-	}
-
-	plugin.uniques.updateCheckedAndHighlight(guid);
-	plugin.uniques.sync(guid);
+window.plugin.uniques.setPortalAction = function(portal, action) {
+  let latE6 = portal.latE6;
+  let lngE6 = portal.lngE6;
+  let guid = window.findPortalGuidByPositionE6(latE6, lngE6);
+  let id = latE6 + "," + lngE6;
+
+  if (guid) {
+    let uniqueInfo = window.plugin.uniques.uniques[guid];
+    if (!uniqueInfo) uniqueInfo = {};
+        // merge ALL pending actions, then remove from missedLatLngs
+    if (window.plugin.uniques.missedLatLngs[id]) {
+      Object.assign(uniqueInfo,window.uniques.missedLatLngs[id].action);
+      delete window.plugin.uniques.missedLatLngs[id];
+      window.plugin.uniques.storeLocal('missedLatLngs');
+    }
+    uniqueInfo[action] = true;
+    // special handling for captured
+    if (action === 'captured') uniqueInfo.visited = true;
+    window.plugin.uniques.uniques[guid] = uniqueInfo;
+    window.plugin.uniques.storeLocal('uniques');
+    // trigger highlighters
+    plugin.uniques.updateCheckedAndHighlight(guid);
+    // triger sync
+    plugin.uniques.sync(guid);
+  } else { //guid not found, so add to missedLatLngs
+    if (!window.plugin.uniques.missedLatLngs[id])
+      window.plugin.uniques.missedLatLngs[id] = {portal:portal,action:{}};
+    window.plugin.uniques.missedLatLngs[id].action[action] = true;
+    if (action === 'captured') window.plugin.uniques.missedLatLngs[id].action.visited = true;
+    window.plugin.uniques.storeLocal('missedLatLngs');
+  }
 }
-
+// Visted
 window.plugin.uniques.updateVisited = function(visited, guid) {
-	if(guid == undefined) guid = window.selectedPortal;
-
-	var uniqueInfo = plugin.uniques.uniques[guid];
-	if (!uniqueInfo) {
-		plugin.uniques.uniques[guid] = uniqueInfo = {
-			visited: false,
-			captured: false
-		};
-	}
-
-	if(visited == uniqueInfo.visited) return;
-
-	if (visited) {
-		uniqueInfo.visited = true;
-	} else { // not visited --> not captured
-		uniqueInfo.visited = false;
-		uniqueInfo.captured = false;
-	}
-
-	plugin.uniques.updateCheckedAndHighlight(guid);
-	plugin.uniques.sync(guid);
+  if(guid == undefined) guid = window.selectedPortal;
+
+  var uniqueInfo = plugin.uniques.uniques[guid];
+  if (!uniqueInfo) {
+    plugin.uniques.uniques[guid] = uniqueInfo = {
+      visited: false,
+      captured: false
+    };
+  }
+
+  if(visited == uniqueInfo.visited) return;
+
+  if (visited) {
+    uniqueInfo.visited = true;
+  } else { // not visited --> not captured
+    uniqueInfo.visited = false;
+    uniqueInfo.captured = false;
+  }
+
+  plugin.uniques.updateCheckedAndHighlight(guid);
+  plugin.uniques.sync(guid);
 }
-
+// Captured
 window.plugin.uniques.updateCaptured = function(captured, guid) {
-	if(guid == undefined) guid = window.selectedPortal;
-
-	var uniqueInfo = plugin.uniques.uniques[guid];
-	if (!uniqueInfo) {
-		plugin.uniques.uniques[guid] = uniqueInfo = {
-			visited: false,
-			captured: false
-		};
-	}
-
-	if(captured == uniqueInfo.captured) return;
-
-	if (captured) { // captured --> visited
-		uniqueInfo.captured = true;
-		uniqueInfo.visited = true;
-	} else {
-		uniqueInfo.captured = false;
-	}
-
-	plugin.uniques.updateCheckedAndHighlight(guid);
-	plugin.uniques.sync(guid);
+  if(guid == undefined) guid = window.selectedPortal;
+
+  var uniqueInfo = plugin.uniques.uniques[guid];
+  if (!uniqueInfo) {
+    plugin.uniques.uniques[guid] = uniqueInfo = {
+      visited: false,
+      captured: false
+    };
+  }
+
+  if(captured == uniqueInfo.captured) return;
+
+  if (captured) { // captured --> visited
+    uniqueInfo.captured = true;
+    uniqueInfo.visited = true;
+  } else {
+    uniqueInfo.captured = false;
+  }
+
+  plugin.uniques.updateCheckedAndHighlight(guid);
+  plugin.uniques.sync(guid);
+}
+// Scouted
+window.plugin.uniques.updateScouted = function(scouted, guid) {
+  if(guid == undefined) guid = window.selectedPortal;
+
+  var uniqueInfo = plugin.uniques.uniques[guid];
+  if (!uniqueInfo) {
+    plugin.uniques.uniques[guid] = uniqueInfo = {
+      scouted: false,
+    };
+  }
+
+  if(scouted == uniqueInfo.scouted) return;
+
+  if (scouted) {
+    uniqueInfo.scouted = true;
+  } else {
+    uniqueInfo.scouted = false;
+  }
+
+  plugin.uniques.updateCheckedAndHighlight(guid);
+  plugin.uniques.sync(guid);
+}
+// Droned
+window.plugin.uniques.updateDroned = function(droned, guid) {
+  if(guid == undefined) guid = window.selectedPortal;
+
+  var uniqueInfo = plugin.uniques.uniques[guid];
+  if (!uniqueInfo) {
+    plugin.uniques.uniques[guid] = uniqueInfo = {
+      droned: false
+    };
+  }
+
+  if(droned == uniqueInfo.droned) return;
+
+  if (droned) {
+    uniqueInfo.droned = true;
+  } else {
+    uniqueInfo.droned = false;
+  }
+
+  plugin.uniques.updateCheckedAndHighlight(guid);
+  plugin.uniques.sync(guid);
 }
 
 // stores the gived GUID for sync
 plugin.uniques.sync = function(guid) {
-	plugin.uniques.updateQueue[guid] = true;
-	plugin.uniques.storeLocal('uniques');
-	plugin.uniques.storeLocal('updateQueue');
-	plugin.uniques.syncQueue();
+  plugin.uniques.updateQueue[guid] = true;
+  plugin.uniques.storeLocal('uniques');
+  plugin.uniques.storeLocal('updateQueue');
+  plugin.uniques.syncQueue();
 }
 
 // sync the queue, but delay the actual sync to group a few updates in a single request
 window.plugin.uniques.syncQueue = function() {
-	if(!plugin.uniques.enableSync) return;
-	
-	clearTimeout(plugin.uniques.syncTimer);
-	
-	plugin.uniques.syncTimer = setTimeout(function() {
-		plugin.uniques.syncTimer = null;
-
-		$.extend(plugin.uniques.updatingQueue, plugin.uniques.updateQueue);
-		plugin.uniques.updateQueue = {};
-		plugin.uniques.storeLocal('updatingQueue');
-		plugin.uniques.storeLocal('updateQueue');
-
-		plugin.sync.updateMap('uniques', 'uniques', Object.keys(plugin.uniques.updatingQueue));
-	}, plugin.uniques.SYNC_DELAY);
+  if(!plugin.uniques.enableSync) return;
+
+  clearTimeout(plugin.uniques.syncTimer);
+
+  plugin.uniques.syncTimer = setTimeout(function() {
+    plugin.uniques.syncTimer = null;
+
+    $.extend(plugin.uniques.updatingQueue, plugin.uniques.updateQueue);
+    plugin.uniques.updateQueue = {};
+    plugin.uniques.storeLocal('updatingQueue');
+    plugin.uniques.storeLocal('updateQueue');
+
+    plugin.sync.updateMap('uniques', 'uniques', Object.keys(plugin.uniques.updatingQueue));
+  }, plugin.uniques.SYNC_DELAY);
 }
 
 //Call after IITC and all plugin loaded
 window.plugin.uniques.registerFieldForSyncing = function() {
-	if(!window.plugin.sync) return;
-	window.plugin.sync.registerMapForSync('uniques', 'uniques', window.plugin.uniques.syncCallback, window.plugin.uniques.syncInitialed);
+  if(!window.plugin.sync) return;
+  window.plugin.sync.registerMapForSync('uniques', 'uniques', window.plugin.uniques.syncCallback, window.plugin.uniques.syncInitialed);
 }
 
 //Call after local or remote change uploaded
 window.plugin.uniques.syncCallback = function(pluginName, fieldName, e, fullUpdated) {
-	if(fieldName === 'uniques') {
-		plugin.uniques.storeLocal('uniques');
-		// All data is replaced if other client update the data during this client
-		// offline,
-		// fire 'pluginUniquesRefreshAll' to notify a full update
-		if(fullUpdated) {
-			// a full update - update the selected portal sidebar
-			if (window.selectedPortal) {
-				plugin.uniques.updateCheckedAndHighlight(window.selectedPortal);
-			}
-			// and also update all highlights, if needed
-			if (window.plugin.uniques.isHighlightActive) {
-				resetHighlightedPortals();
-			}
-
-			window.runHooks('pluginUniquesRefreshAll');
-			return;
-		}
-
-		if(!e) return;
-		if(e.isLocal) {
-			// Update pushed successfully, remove it from updatingQueue
-			delete plugin.uniques.updatingQueue[e.property];
-		} else {
-			// Remote update
-			delete plugin.uniques.updateQueue[e.property];
-			plugin.uniques.storeLocal('updateQueue');
-			plugin.uniques.updateCheckedAndHighlight(e.property);
-			window.runHooks('pluginUniquesUpdateUniques', {guid: e.property});
-		}
-	}
+  if(fieldName === 'uniques') {
+    plugin.uniques.storeLocal('uniques');
+    // All data is replaced if other client update the data during this client
+    // offline,
+    // fire 'pluginUniquesRefreshAll' to notify a full update
+    if(fullUpdated) {
+      // a full update - update the selected portal sidebar
+      if (window.selectedPortal) {
+        plugin.uniques.updateCheckedAndHighlight(window.selectedPortal);
+      }
+      // and also update all highlights, if needed
+      if (window.plugin.uniques.isHighlightActive) {
+        resetHighlightedPortals();
+      }
+
+      window.runHooks('pluginUniquesRefreshAll');
+      return;
+    }
+
+    if(!e) return;
+    if(e.isLocal) {
+      // Update pushed successfully, remove it from updatingQueue
+      delete plugin.uniques.updatingQueue[e.property];
+    } else {
+      // Remote update
+      delete plugin.uniques.updateQueue[e.property];
+      plugin.uniques.storeLocal('updateQueue');
+      plugin.uniques.updateCheckedAndHighlight(e.property);
+      window.runHooks('pluginUniquesUpdateUniques', {guid: e.property});
+    }
+  }
 }
 
 //syncing of the field is initialed, upload all queued update
 window.plugin.uniques.syncInitialed = function(pluginName, fieldName) {
-	if(fieldName === 'uniques') {
-		plugin.uniques.enableSync = true;
-		if(Object.keys(plugin.uniques.updateQueue).length > 0) {
-			plugin.uniques.syncQueue();
-		}
-	}
+  if(fieldName === 'uniques') {
+    plugin.uniques.enableSync = true;
+    if(Object.keys(plugin.uniques.updateQueue).length > 0) {
+      plugin.uniques.syncQueue();
+    }
+  }
 }
 
 window.plugin.uniques.storeLocal = function(name) {
-	var key = window.plugin.uniques.FIELDS[name];
-	if(key === undefined) return;
+  var key = window.plugin.uniques.FIELDS[name];
+  if(key === undefined) return;
 
-	var value = plugin.uniques[name];
+  var value = plugin.uniques[name];
 
-	if(typeof value !== 'undefined' && value !== null) {
-		localStorage[key] = JSON.stringify(plugin.uniques[name]);
-	} else {
-		localStorage.removeItem(key);
-	}
+  if(typeof value !== 'undefined' && value !== null) {
+    localStorage[key] = JSON.stringify(plugin.uniques[name]);
+  } else {
+    localStorage.removeItem(key);
+  }
 }
 
 window.plugin.uniques.loadLocal = function(name) {
-	var key = window.plugin.uniques.FIELDS[name];
-	if(key === undefined) return;
+  var key = window.plugin.uniques.FIELDS[name];
+  if(key === undefined) return;
 
-	if(localStorage[key] !== undefined) {
-		plugin.uniques[name] = JSON.parse(localStorage[key]);
-	}
+  if(localStorage[key] !== undefined) {
+    plugin.uniques[name] = JSON.parse(localStorage[key]);
+  }
 }
 
-/***************************************************************************************************************************************************************/
-/** HIGHLIGHTER ************************************************************************************************************************************************/
-/***************************************************************************************************************************************************************/
-window.plugin.uniques.highlighter = {
-	highlight: function(data) {
-		var guid = data.portal.options.ent[0];
-		var uniqueInfo = window.plugin.uniques.uniques[guid];
-
-		var style = {};
-
-		if (uniqueInfo) {
-			if (uniqueInfo.captured) {
-				// captured (and, implied, visited too) - no highlights
-
-			} else if (uniqueInfo.visited) {
-				style.fillColor = 'yellow';
-				style.fillOpacity = 0.6;
-			} else {
-				// we have an 'uniqueInfo' entry for the portal, but it's not set visited or captured?
-				// could be used to flag a portal you don't plan to visit, so use a less opaque red
-				style.fillColor = 'red';
-				style.fillOpacity = 0.5;
-			}
-		} else {
-			// no visit data at all
-			style.fillColor = 'red';
-			style.fillOpacity = 0.7;
-		}
-
-		data.portal.setStyle(style);
-	},
-
-	setSelected: function(active) {
-		window.plugin.uniques.isHighlightActive = active;
-	}
+/****************************************************************************************/
+/** HIGHLIGHTERS ************************************************************************/
+/****************************************************************************************/
+// highlighter captured
+window.plugin.uniques.highlighterCaptured = {
+  highlight: function(data) {
+    var guid = data.portal.options.ent[0];
+    var uniqueInfo = window.plugin.uniques.uniques[guid];
+
+    var style = {};
+
+    if (uniqueInfo) {
+      if (uniqueInfo.captured) {
+        // captured (and, implied, visited too) - no highlights
+
+      } else if (uniqueInfo.visited) {
+        style.fillColor = 'yellow';
+        style.fillOpacity = 0.6;
+      } else {
+        // we have an 'uniqueInfo' entry for the portal, but it's not set visited or captured?
+        // could be used to flag a portal you don't plan to visit, so use a less opaque red
+        style.fillColor = 'red';
+        style.fillOpacity = 0.5;
+      }
+    } else {
+      // no visit data at all
+      style.fillColor = 'red';
+      style.fillOpacity = 0.7;
+    }
+
+    data.portal.setStyle(style);
+  },
+
+  setSelected: function(active) {
+    window.plugin.uniques.isHighlightActive = active;
+  }
 }
 
+// highlighter scouted
+window.plugin.uniques.highlighterScouted = {
+  highlight: function(data) {
+    var guid = data.portal.options.ent[0];
+    var uniqueInfo = window.plugin.uniques.uniques[guid];
+
+    var style = {};
+
+    if (uniqueInfo && uniqueInfo.scouted)
+    { // scouted - no highlights
+    } else {
+        style.fillColor = 'red';
+        style.fillOpacity = 0.7;
+    }
+    data.portal.setStyle(style);
+  },
+
+  setSelected: function(active) {
+    window.plugin.uniques.isHighlightActive = active;
+  }
+}
+// highlighter droned
+window.plugin.uniques.highlighterDroned = {
+  highlight: function(data) {
+    var guid = data.portal.options.ent[0];
+    var uniqueInfo = window.plugin.uniques.uniques[guid];
+
+    var style = {};
+
+    if (uniqueInfo && uniqueInfo.droned)
+    { // droneded - no highlights
+    } else {
+        style.fillColor = 'red';
+        style.fillOpacity = 0.7;
+    }
+    data.portal.setStyle(style);
+  },
+
+  setSelected: function(active) {
+    window.plugin.uniques.isHighlightActive = active;
+  }
+}
 
 window.plugin.uniques.setupCSS = function() {
-	$("<style>")
-	.prop("type", "text/css")
-	.html('@include_string:uniques.css@')
-	.appendTo("head");
+  $("<style>")
+  .prop("type", "text/css")
+  .html('\
+#uniques-container {\
+  display: block;\
+  text-align: center;\
+  margin: 6px 3px 1px 3px;\
+  padding: 0 4px;\
+}\
+#uniques-container label {\
+  margin: 0 0.5em;\
+}\
+#uniques-container input {\
+  vertical-align: middle;\
+}\
+\
+.portal-list-uniques input[type=\'checkbox\'] {\
+  padding: 0;\
+  height: auto;\
+  margin-top: -5px;\
+  margin-bottom: -5px;\
+}\
+\
+.ui-dialog-portalslist {\
+  max-width: none !important;\
+}\
+\
+')
+  .appendTo("head");
 }
 
 window.plugin.uniques.setupContent = function() {
-	plugin.uniques.contentHTML = '<div id="uniques-container">'
-		+ '<label><input type="checkbox" id="visited" onclick="window.plugin.uniques.updateVisited($(this).prop(\'checked\'))"> Visited</label>'
-		+ '<label><input type="checkbox" id="captured" onclick="window.plugin.uniques.updateCaptured($(this).prop(\'checked\'))"> Captured</label>'
-		+ '</div>';
-	plugin.uniques.disabledMessage = '<div id="uniques-container" class="help" title="Your browser does not support localStorage">Plugin Uniques disabled</div>';
+  plugin.uniques.contentHTML = '<div id="uniques-container">'
+    + '<label><input type="checkbox" id="visited" onclick="window.plugin.uniques.updateVisited($(this).prop(\'checked\'))"> Visited</label>'
+    + '<label><input type="checkbox" id="captured" onclick="window.plugin.uniques.updateCaptured($(this).prop(\'checked\'))"> Captured</label>'
+    + '<label><input type="checkbox" id="scouted" onclick="window.plugin.uniques.updateScouted($(this).prop(\'checked\'))"> Scouted</label>'
+    + '<label><input type="checkbox" id="droned" onclick="window.plugin.uniques.updateDroned($(this).prop(\'checked\'))"> Droned</label>'
+    + '</div>';
+  plugin.uniques.disabledMessage = '<div id="uniques-container" class="help" title="Your browser does not support localStorage">Plugin Uniques disabled</div>';
 }
-
+// ***************************************************************************************
 window.plugin.uniques.setupPortalsList = function() {
 
-	window.addHook('pluginUniquesUpdateUniques', function(data) {
-		var info = plugin.uniques.uniques[data.guid];
-		if(!info) info = { visited: false, captured: false };
-
-		$('[data-list-uniques="'+data.guid+'"].visited').prop('checked', !!info.visited);
-		$('[data-list-uniques="'+data.guid+'"].captured').prop('checked', !!info.captured);
-	});
-
-	window.addHook('pluginUniquesRefreshAll', function() {
-		$('[data-list-uniques]').each(function(i, element) {
-			var guid = element.getAttribute("data-list-uniques");
-
-			var info = plugin.uniques.uniques[guid];
-			if(!info) info = { visited: false, captured: false };
-
-			var e = $(element);
-			if(e.hasClass('visited')) e.prop('checked', !!info.visited);
-			if(e.hasClass('captured')) e.prop('checked', !!info.captured);
-		});
-	});
-
-	function uniqueValue(guid) {
-		var info = plugin.uniques.uniques[guid];
-		if(!info) return 0;
-
-		if(info.visited && info.captured) return 2;
-		if(info.visited) return 1;
-	}
-
-	window.plugin.portalslist.fields.push({
-		title: "Visit",
-		value: function(portal) { return portal.options.guid; }, // we store the guid, but implement a custom comparator so the list does sort properly without closing and reopening the dialog
-		sort: function(guidA, guidB) {
-			return uniqueValue(guidA) - uniqueValue(guidB);
-		},
-		format: function(cell, portal, guid) {
-			var info = plugin.uniques.uniques[guid];
-			if(!info) info = { visited: false, captured: false };
-
-			$(cell).addClass("portal-list-uniques");
-
-			// for some reason, jQuery removes event listeners when the list is sorted. Therefore we use DOM's addEventListener
-			$('<input>')
-				.prop({
-					type: "checkbox",
-					className: "visited",
-					title: "Portal visited?",
-					checked: !!info.visited,
-				})
-				.attr("data-list-uniques", guid)
-				.appendTo(cell)
-				[0].addEventListener("change", function(ev) {
-					window.plugin.uniques.updateVisited(this.checked, guid);
-					ev.preventDefault();
-					return false;
-				}, false);
-			$('<input>')
-				.prop({
-					type: "checkbox",
-					className: "captured",
-					title: "Portal captured?",
-					checked: !!info.captured,
-				})
-				.attr("data-list-uniques", guid)
-				.appendTo(cell)
-				[0].addEventListener("change", function(ev) {
-					window.plugin.uniques.updateCaptured(this.checked, guid);
-					ev.preventDefault();
-					return false;
-				}, false);
-		},
-	});
-}
+  window.addHook('pluginUniquesUpdateUniques', function(data) {
+    var info = plugin.uniques.uniques[data.guid];
+    if(!info) info = { visited: false, captured: false, scouted: false, droned: false  };
+
+    $('[data-list-uniques="'+data.guid+'"].visited').prop('checked', !!info.visited);
+    $('[data-list-uniques="'+data.guid+'"].captured').prop('checked', !!info.captured);
+    $('[data-list-uniques="'+data.guid+'"].scouted').prop('checked', !!info.scouted);
+    $('[data-list-uniques="'+data.guid+'"].droned').prop('checked', !!info.droned);
+  });
+
+  window.addHook('pluginUniquesRefreshAll', function() {
+    $('[data-list-uniques]').each(function(i, element) {
+      var guid = element.getAttribute("data-list-uniques");
+
+      var info = plugin.uniques.uniques[guid];
+      if(!info) info = { visited: false, captured: false, scouted: false, droned: false };
+
+      var e = $(element);
+      if(e.hasClass('visited')) e.prop('checked', !!info.visited);
+      if(e.hasClass('captured')) e.prop('checked', !!info.captured);
+      if(e.hasClass('scouted')) e.prop('checked', !!info.scouted);
+      if(e.hasClass('droned')) e.prop('checked', !!info.droned);
+    });
+  });
+
+  function uniqueValue(guid) {
+    var info = plugin.uniques.uniques[guid];
+    if(!info) return 0;
+    if(info.visited === undefined) return 0;
+    if(!info.visited) return 0;
+    if(info.visited && info.captured) return 2;
+    if(info.visited) return 1;
+  }
+
+  function scoutedValue(guid) {
+    var info = plugin.uniques.uniques[guid];
+    if (!info) return 0;
+    if (info.scouted === undefined ) return 0;
+    if (info.scouted === true) return 1;
+  }
+
+  function dronedValue(guid) {
+    var info = plugin.uniques.uniques[guid];
+    if (!info) return 0;
+    if (info.droned === undefined ) return 0;
+    if (info.droned === true) return 1;
+  }
+
+  window.plugin.portalslist.fields.push(
+    {title: "V/C",
+    value: function(portal) { return portal.options.guid; }, // we store the guid, but implement a custom comparator so the list does sort properly without closing and reopening the dialog
+    sort: function(guidA, guidB) {
+      return uniqueValue(guidA) - uniqueValue(guidB);
+    },
+    format: function(cell, portal, guid) {
+      var info = plugin.uniques.uniques[guid];
+      if(!info) info = { visited: false, captured: false, scouted: false, droned: false  };
+
+      $(cell).addClass("portal-list-uniques");
+
+      // for some reason, jQuery removes event listeners when the list is sorted. Therefore we use DOM's addEventListener
+      $('<input>')
+        .prop({
+          type: "checkbox",
+          className: "visited",
+          title: "Portal visited?",
+          checked: !!info.visited,
+        })
+        .attr("data-list-uniques", guid)
+        .appendTo(cell)
+        [0].addEventListener("change", function(ev) {
+          window.plugin.uniques.updateVisited(this.checked, guid);
+          ev.preventDefault();
+          return false;
+        }, false);
+      $('<input>')
+        .prop({
+          type: "checkbox",
+          className: "captured",
+          title: "Portal captured?",
+          checked: !!info.captured,
+        })
+        .attr("data-list-uniques", guid)
+        .appendTo(cell)
+        [0].addEventListener("change", function(ev) {
+          window.plugin.uniques.updateCaptured(this.checked, guid);
+          ev.preventDefault();
+          return false;
+        }, false);
+      },
+    },
+//---------------------------------------------------------------------------
+    {title: "S",
+      value: function(portal) { return portal.options.guid; }, // we store the guid, but implement a custom comparator so the list does sort properly without closing and reopening the dialog
+      sort:  function(guidA, guidB) {
+        return scoutedValue(guidA) - scoutedValue(guidB);
+      },
+      format: function(cell, portal, guid) {
+      var info = plugin.uniques.uniques[guid];
+      if(!info) info = { visited: false, captured: false, scouted: false, droned: false  };
+
+      $(cell).addClass("portal-list-uniques");
+
+      // for some reason, jQuery removes event listeners when the list is sorted. Therefore we use DOM's addEventListener
+      $('<input>')
+        .prop({
+          type: "checkbox",
+          className: "scouted",
+          title: "Portal scouted?",
+          checked: !!info.scouted,
+        })
+        .attr("data-list-uniques", guid)
+        .appendTo(cell)
+        [0].addEventListener("change", function(ev) {
+          window.plugin.uniques.updateScouted(this.checked, guid);
+          ev.preventDefault();
+          return false;
+        }, false);
+    },
+  },
+//---------------------------------------------------------------------------
+    {title: "D",
+      value: function(portal) { return portal.options.guid; }, // we store the guid, but implement a custom comparator so the list does sort properly without closing and reopening the dialog
+      sort:  function(guidA, guidB) {
+        return dronedValue(guidA) - dronedValue(guidB);
+      },
+      format: function(cell, portal, guid) {
+      var info = plugin.uniques.uniques[guid];
+      if(!info) info = { visited: false, captured: false, scouted: false, droned: false  };
+
+      $(cell).addClass("portal-list-uniques");
+
+      // for some reason, jQuery removes event listeners when the list is sorted. Therefore we use DOM's addEventListener
+      $('<input>')
+        .prop({
+          type: "checkbox",
+          className: "droned",
+          title: "Portal droned?",
+          checked: !!info.droned,
+        })
+        .attr("data-list-uniques", guid)
+        .appendTo(cell)
+        [0].addEventListener("change", function(ev) {
+          window.plugin.uniques.updateDroned(this.checked, guid);
+          ev.preventDefault();
+          return false;
+        }, false);
+    },
+  }
+// --------------------------------------------------------------------------
+
+  );
+};
 
 window.plugin.uniques.onMissionChanged = function(data) {
-	if(!data.local) return;
-	
-	var mission = window.plugin.missions && window.plugin.missions.getMissionCache(data.mid, false);
-	if(!mission) return;
-	
-	window.plugin.uniques.checkMissionWaypoints(mission);
+  if(!data.local) return;
+
+  var mission = window.plugin.missions && window.plugin.missions.getMissionCache(data.mid, false);
+  if(!mission) return;
+
+  window.plugin.uniques.checkMissionWaypoints(mission);
 };
 
 window.plugin.uniques.onMissionLoaded = function(data) {
-	// the mission has been loaded, but the dialog isn't visible yet.
-	// we'll wait a moment so the mission dialog is opened behind the confirmation prompt
-	setTimeout(function() {
-		window.plugin.uniques.checkMissionWaypoints(data.mission);
-	}, 0);
+  // the mission has been loaded, but the dialog isn't visible yet.
+  // we'll wait a moment so the mission dialog is opened behind the confirmation prompt
+  setTimeout(function() {
+    window.plugin.uniques.checkMissionWaypoints(data.mission);
+  }, 0);
 };
 
 window.plugin.uniques.checkMissionWaypoints = function(mission) {
-	if(!(window.plugin.missions && window.plugin.missions.checkedMissions[mission.guid])) return;
-	
-	if(!mission.waypoints) return;
-	
-	function isValidWaypoint(wp) {
-		// might be hidden or field trip card
-		if(!(wp && wp.portal && wp.portal.guid)) return false;
-		
-		// only use hack, deploy, link, field and upgrade; ignore photo and passphrase
-		if(wp.objectiveNum <= 0 || wp.objectiveNum > 5) return false;
-		
-		return true;
-	}
-	function isVisited(wp) {
-		var guid = wp.portal.guid,
-			uniqueInfo = plugin.uniques.uniques[guid],
-			visited = (uniqueInfo && uniqueInfo.visited) || false;
-		
-		return visited;
-	}
-	
-	// check if all waypoints are already visited
-	if(mission.waypoints.every(function(wp) {
-		if(!isValidWaypoint(wp)) return true;
-		return isVisited(wp);
-	})) return;
-	
-	if(!confirm('The mission ' + mission.title + ' contains waypoints not yet marked as visited.\n\n' +
-			'Do you want to set them to \'visited\' now?'))
-		return;
-	
-	mission.waypoints.forEach(function(wp) {
-		if(!isValidWaypoint(wp)) return;
-		if(isVisited(wp)) return;
-		
-		plugin.uniques.setPortalVisited(wp.portal.guid);
-	});
+  if(!(window.plugin.missions && window.plugin.missions.checkedMissions[mission.guid])) return;
+
+  if(!mission.waypoints) return;
+
+  function isValidWaypoint(wp) {
+    // might be hidden or field trip card
+    if(!(wp && wp.portal && wp.portal.guid)) return false;
+
+    // only use hack, deploy, link, field and upgrade; ignore photo and passphrase
+    if(wp.objectiveNum <= 0 || wp.objectiveNum > 5) return false;
+
+    return true;
+  }
+  function isVisited(wp) {
+    var guid = wp.portal.guid,
+      uniqueInfo = plugin.uniques.uniques[guid],
+      visited = (uniqueInfo && uniqueInfo.visited) || false;
+
+    return visited;
+  }
+
+  // check if all waypoints are already visited
+  if(mission.waypoints.every(function(wp) {
+    if(!isValidWaypoint(wp)) return true;
+    return isVisited(wp);
+  })) return;
+
+  if(!confirm('The mission ' + mission.title + ' contains waypoints not yet marked as visited.\n\n' +
+      'Do you want to set them to \'visited\' now?'))
+    return;
+
+  mission.waypoints.forEach(function(wp) {
+    if(!isValidWaypoint(wp)) return;
+    if(isVisited(wp)) return;
+
+    plugin.uniques.setPortalAction(wp.portal.guid,'visited');
+  });
 };
+/****************************************************************************************/
+/** Im-/Export of uniques ***************************************************************/
+/****************************************************************************************/
+window.plugin.uniques.optExport = function() {
+  var data = localStorage['plugin-uniques-data'];
+  window.saveFile(data, 'IITC-uniques.json', 'application/json');
+  confirm ("IITC-Uniques exported to IITC-uniques.json");
+}
+window.plugin.uniques.optImport = function() {
+  L.FileListLoader.loadFiles({accept:'application/json'})
+    .on('load',function (e) {
+      try {
+        if (!confirm("Please only confirm this if you know what you are doing!!\nAre you sure you want to save your Unique visits/captures back to IITC?")) return;
+        var data = JSON.parse(e.reader.result);
+
+        if (!data.length === 0) window.plugin.uniques.uniques = data;
+        console.log('UNIQUES: reset and imported uniques.');
+        confirm('Import Successful.');
+        // to write back the data to localStorage
+        window.plugin.uniques.storeLocal();
+      } catch(e) {
+        console.warn('UNIQUES: failed to import data: '+e);
+      }
+    });
+}
 
+/*****************************************************************************************/
+/** UNIQUES Backlog to be processed whenever a portal's LatLonE6 can be resolved to GUID */
+/*****************************************************************************************/
+window.plugin.uniques.onPortalAdded = function(data) {
+  let guid = data.portal.options.guid;
+  let p = data.portal.options.data;
+  let id = p.latE6 + "," + p.lngE6;
+
+  //console.log("portal added: %s %s %o", guid, id, data);
+  // check if portal is in missedLatLngs
+  if (window.plugin.uniques.missedLatLngs[id]) {
+    console.log("found portal guid for previously missed portal: %s -> %s (%o)", id, guid, data);
+    window.plugin.uniques.uniques[guid] = Object.assign (
+      {},
+      window.plugin.uniques.uniques[guid],
+      window.plugin.uniques.missedLatLngs[id].action
+    );
+    window.plugin.uniques.storeLocal('uniques');
+    delete window.plugin.uniques.missedLatLngs[id];
+    window.plugin.uniques.storeLocal('missedLatLngs');
+    $("#missedPL").html(window.plugin.uniques.genList());
+  }
+}
+
+window.plugin.uniques.removeOldParsedMsgs = function() {
+//  remove all timestamps older than 30 days
+  let old = (Date.now() - (30*24*60*60*1000)); //30 days in miliseconds
+  let count = 0;
+  for (let item in window.plugin.uniques.parsedMsgs){
+    if (item < old) {
+      delete item;
+      count++;
+    }
+  }
+  console.log ('[uniques] removed %s old parsedMsgs', count);
+}
 
+window.plugin.uniques.genList = function (){
+  let mLL = window.plugin.uniques.missedLatLngs;
+  let list = '';
+  for (let item in mLL) {
+    let p = mLL[item].portal;
+    list = list + '<a onclick=\"map.setView(['+p.latE6/1E6+','+p.lngE6/1E6+'],15);\">'+p.name+'</a><br>';
+  }
+  return list
+}
+
+window.plugin.uniques.options = function (){
+  aoPortals=window.plugin.uniques.uniques;
+  visited=captured=scouted=droned=0;
+  $.each(aoPortals,function(PUID){
+    aPortal=window.plugin.uniques.uniques[PUID];
+    if (aPortal.visited) visited++;
+    if (aPortal.captured) captured++;
+    if (aPortal.scouted) scouted++;
+    if (aPortal.droned) droned++;
+  });
+
+  let list = 'Unique Portals Count:<br>visited: '+visited+' - captured: '+captured+'<br>scouted: '+scouted+' - droned: '+droned+'<br><hr>'
+      + 'Missed Portals: <br>Click on portals to move the map to resolve the backlogged actions for this portal.<br><br>'
+      + '<div id="missedPL" style="height:150px;overflow:auto">'
+      + window.plugin.uniques.genList()
+      + '</div><hr>'
+      + '<a onclick=\"window.plugin.uniques.optExport();\" title=\"Export portals\' unique info to IITC.\">Backup</a> / '
+      + '<a onclick=\"window.plugin.uniques.optImport();\" title=\"Import portals\' unique info to IITC.\">Restore</a> Uniques'
+  var dialog = window.dialog ({
+    title: "Uniques",
+    html: list,
+    maxHight: 300
+
+  }).parent();
+
+  return dialog;
+}
+/****************************************************************************************/
 var setup = function() {
-	// HOOKS:
-	// - pluginUniquesUpdateUniques
-	// - pluginUniquesRefreshAll
-
-	window.plugin.uniques.setupCSS();
-	window.plugin.uniques.setupContent();
-	window.plugin.uniques.loadLocal('uniques');
-	window.addPortalHighlighter('Uniques', window.plugin.uniques.highlighter);
-	window.addHook('portalDetailsUpdated', window.plugin.uniques.onPortalDetailsUpdated);
-	window.addHook('publicChatDataAvailable', window.plugin.uniques.onPublicChatDataAvailable);
-	window.plugin.uniques.registerFieldForSyncing();
-	
-	// to mark mission portals as visited
-	window.addHook('plugin-missions-mission-changed', window.plugin.uniques.onMissionChanged);
-	window.addHook('plugin-missions-loaded-mission', window.plugin.uniques.onMissionLoaded);
-	
-	if (window.plugin.portalslist) {
-		window.plugin.uniques.setupPortalsList();
-	}
+  // HOOKS:
+  // - pluginUniquesUpdateUniques
+  // - pluginUniquesRefreshAll
+
+  window.plugin.uniques.setupCSS();
+  window.plugin.uniques.setupContent();
+  window.plugin.uniques.loadLocal('uniques');
+  window.plugin.uniques.loadLocal('missedLatLngs');
+  window.plugin.uniques.loadLocal('parsedMsgs');
+
+  window.plugin.uniques.removeOldParsedMsgs();
+
+  window.addPortalHighlighter('Droned', window.plugin.uniques.highlighterDroned);
+  window.addPortalHighlighter('Scouted', window.plugin.uniques.highlighterScouted);
+  window.addPortalHighlighter('Visited/Captured', window.plugin.uniques.highlighterCaptured);
+
+  window.addHook('portalDetailsUpdated', window.plugin.uniques.onPortalDetailsUpdated);
+  window.addHook('publicChatDataAvailable', window.plugin.uniques.onPublicChatDataAvailable);
+  window.addHook('alertsChatDataAvailable', window.plugin.uniques.onPublicChatDataAvailable);
+  window.addHook('portalAdded', window.plugin.uniques.onPortalAdded);
+  window.plugin.uniques.registerFieldForSyncing();
+
+  // to mark mission portals as visited
+  window.addHook('plugin-missions-mission-changed', window.plugin.uniques.onMissionChanged);
+  window.addHook('plugin-missions-loaded-mission', window.plugin.uniques.onMissionLoaded);
+
+  // add controls to toolbox
+
+  link = $("<a onclick=\"window.plugin.uniques.options();\" title=\"Manage UNIQUES\">Uniques</a>");
+  $("#toolbox").append(link);
+
+  if (window.plugin.portalslist) {
+    window.plugin.uniques.setupPortalsList();
+  }
 }