diff --git a/dist/olHelpers/mapPopup.js.map b/dist/olHelpers/mapPopup.js.map
index fc59e85275cb6be813b7715d3eec46a8ef400571..6e6546f9f9b40090ba788012bfd586a4609a35b6 100644
--- a/dist/olHelpers/mapPopup.js.map
+++ b/dist/olHelpers/mapPopup.js.map
@@ -1 +1 @@
-{"version":3,"file":"mapPopup.js","sourceRoot":"","sources":["../../src/olHelpers/mapPopup.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,4BAAwB,eAAe,CAAC,CAAA;AAExC;;;GAGG;AAEU,gBAAQ,GAAG,IAAI,qBAAW,EAAiB,CAAC;AACzD;kBAAe,gBAAQ,CAAC"}
\ No newline at end of file
+{"version":3,"file":"mapPopup.js","sourceRoot":"","sources":["../../src/olHelpers/mapPopup.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,4BAAwB,eAAe,CAAC,CAAA;AAExC;;;GAGG;AACU,gBAAQ,GAAG,IAAI,qBAAW,EAAiB,CAAC;AACzD;kBAAe,gBAAQ,CAAC"}
\ No newline at end of file
diff --git a/dist/olHelpers/mapPopupCls.d.ts b/dist/olHelpers/mapPopupCls.d.ts
index f08c295db343a1b0e6646f0c2df1c861dc865a37..d9d9337787a168f6ef6a2b8fdc6c36a9f2e9ccb1 100644
--- a/dist/olHelpers/mapPopupCls.d.ts
+++ b/dist/olHelpers/mapPopupCls.d.ts
@@ -43,25 +43,25 @@ export declare class FeatureLayerProperties {
  * @augments MapInteractionBase
  */
 export declare class MapPopupCls extends MapInteractionBase {
-    _popupOpen: boolean;
-    _passThroughLayerFeatureArray: Array<FeatureLayerProperties>;
-    _currentPopupIndex: number;
-    _popupContentLength: number;
-    _esriMapServiceLayers: Array<LayerEsriMapServer>;
-    _$popupCloser: JQuery;
-    _$popupContent: JQuery;
-    _$popupContainer: JQuery;
-    _popupOverlay: ol.Overlay;
-    _arrPopupLayers: Array<LayerBaseVector>;
-    _popupCoordinate: ol.Coordinate;
-    _popupChangedFunctions: Array<popupChangedFunction>;
-    _mapClickFunctions: Array<Function>;
-    _selectionLayerLookup: Object;
-    _arrPopupLayerIds: Array<string>;
-    _arrPopupLayerNames: Array<string>;
-    _arrPopupOlLayers: Array<ol.layer.Vector>;
-    _arrPopupContentFunction: Array<popupCallback>;
-    _selectionLayers: Array<ol.layer.Vector>;
+    private _popupOpen;
+    private _passThroughLayerFeatureArray;
+    private _currentPopupIndex;
+    private _popupContentLength;
+    private _esriMapServiceLayers;
+    private _$popupCloser;
+    private _$popupContent;
+    private _$popupContainer;
+    private _popupOverlay;
+    private _arrPopupLayers;
+    private _popupCoordinate;
+    private _popupChangedFunctions;
+    private _mapClickFunctions;
+    private _selectionLayerLookup;
+    private _arrPopupLayerIds;
+    private _arrPopupLayerNames;
+    private _arrPopupOlLayers;
+    private _arrPopupContentFunction;
+    private _selectionLayers;
     /**
      * Definition for openlayers style function
      * @callback olStyleFunction
diff --git a/dist/olHelpers/quickMap.d.ts b/dist/olHelpers/quickMap.d.ts
index cb5fe94429ac2d43410a7f73428f1700d08819da..d9ac8ec286d0841607aa238b9b878c10e46715af 100644
--- a/dist/olHelpers/quickMap.d.ts
+++ b/dist/olHelpers/quickMap.d.ts
@@ -17,7 +17,7 @@ import ol from 'custom-ol';
  * @param {number} [options.maxZoom=undefined] max zoom
  * @param {boolean} [options.baseSwitcher=true] if add base map switcher
  * @param {boolean} [options.fullScreen=false] if add base map switcher
- * @returns the ol map
+ * @returns {ol.Map} the ol map
  */
 export declare function quickMap(options?: quickMapOptions): ol.Map;
 export default quickMap;
diff --git a/dist/olHelpers/quickMap.js b/dist/olHelpers/quickMap.js
index 73431033249b1d32b5255597adb323c6128a6e94..dd9267469780fc096f399cf573523478e3d59c46 100644
--- a/dist/olHelpers/quickMap.js
+++ b/dist/olHelpers/quickMap.js
@@ -21,7 +21,7 @@ var nm = provide_1.default('olHelpers');
  * @param {number} [options.maxZoom=undefined] max zoom
  * @param {boolean} [options.baseSwitcher=true] if add base map switcher
  * @param {boolean} [options.fullScreen=false] if add base map switcher
- * @returns the ol map
+ * @returns {ol.Map} the ol map
  */
 function quickMap(options) {
     var m = quickMapBase_1.quickMapBase(options);
diff --git a/src/olHelpers/mapPopup.ts b/src/olHelpers/mapPopup.ts
index c96abe6784b2a98fcbb54132d52ac536babb7538..23118ccc248dc029a1fede9b0c7cea0f29d169d7 100644
--- a/src/olHelpers/mapPopup.ts
+++ b/src/olHelpers/mapPopup.ts
@@ -8,6 +8,5 @@ import MapPopupCls from './mapPopupCls';
  * The single popup object catch is that it is common to multimap pages
  * @type {MapPopupCls}
  */
-
 export const mapPopup = new MapPopupCls() as MapPopupCls;
 export default mapPopup;
diff --git a/src/olHelpers/mapPopupCls.ts b/src/olHelpers/mapPopupCls.ts
index cfbcacb0b6066f576c5f3aeaa95c10f9a28a7b00..cf0a45d6c143c19d47fa3f83eff1f11a9824a16a 100644
--- a/src/olHelpers/mapPopupCls.ts
+++ b/src/olHelpers/mapPopupCls.ts
@@ -76,25 +76,25 @@ export class FeatureLayerProperties {
  * @augments MapInteractionBase
  */
 export class MapPopupCls extends MapInteractionBase {
-    _popupOpen: boolean;
-    _passThroughLayerFeatureArray: Array<FeatureLayerProperties>;
-    _currentPopupIndex: number;
-    _popupContentLength: number;
-    _esriMapServiceLayers: Array<LayerEsriMapServer>;
-    _$popupCloser: JQuery;
-    _$popupContent: JQuery;
-    _$popupContainer: JQuery;
-    _popupOverlay: ol.Overlay;
-    _arrPopupLayers: Array<LayerBaseVector>;
-    _popupCoordinate: ol.Coordinate;
-    _popupChangedFunctions: Array<popupChangedFunction>;
-    _mapClickFunctions: Array<Function>;
-    _selectionLayerLookup: Object;
-    _arrPopupLayerIds: Array<string>;
-    _arrPopupLayerNames: Array<string>;
-    _arrPopupOlLayers: Array<ol.layer.Vector>;
-    _arrPopupContentFunction: Array<popupCallback>;
-    _selectionLayers: Array<ol.layer.Vector>;
+    private _popupOpen: boolean;
+    private _passThroughLayerFeatureArray: Array<FeatureLayerProperties>;
+    private _currentPopupIndex: number;
+    private _popupContentLength: number;
+    private _esriMapServiceLayers: Array<LayerEsriMapServer>;
+    private _$popupCloser: JQuery;
+    private _$popupContent: JQuery;
+    private _$popupContainer: JQuery;
+    private _popupOverlay: ol.Overlay;
+    private _arrPopupLayers: Array<LayerBaseVector>;
+    private _popupCoordinate: ol.Coordinate;
+    private _popupChangedFunctions: Array<popupChangedFunction>;
+    private _mapClickFunctions: Array<Function>;
+    private _selectionLayerLookup: Object;
+    private _arrPopupLayerIds: Array<string>;
+    private _arrPopupLayerNames: Array<string>;
+    private _arrPopupOlLayers: Array<ol.layer.Vector>;
+    private _arrPopupContentFunction: Array<popupCallback>;
+    private _selectionLayers: Array<ol.layer.Vector>;
 
     /**
      * Definition for openlayers style function
diff --git a/src/olHelpers/quickMap.ts b/src/olHelpers/quickMap.ts
index 4d4fdb986f3ec5fd6173ae04a773dd3c4d2be346..dad14d4860e076c0a553e1abb21fce16282b2a41 100644
--- a/src/olHelpers/quickMap.ts
+++ b/src/olHelpers/quickMap.ts
@@ -23,7 +23,7 @@ let nm = provide('olHelpers');
  * @param {number} [options.maxZoom=undefined] max zoom
  * @param {boolean} [options.baseSwitcher=true] if add base map switcher
  * @param {boolean} [options.fullScreen=false] if add base map switcher
- * @returns the ol map
+ * @returns {ol.Map} the ol map
  */
 export function quickMap(options? : quickMapOptions): ol.Map {
     let m = quickMapBase(options);