diff --git a/meteor_packages/mats-common/imports/startup/client/graph_util.js b/meteor_packages/mats-common/imports/startup/client/graph_util.js
index f5a1d5fee..a2e6d217c 100644
--- a/meteor_packages/mats-common/imports/startup/client/graph_util.js
+++ b/meteor_packages/mats-common/imports/startup/client/graph_util.js
@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 
-import { matsTypes } from "meteor/randyp:mats-common";
+import { matsTypes, matsCurveUtils } from "meteor/randyp:mats-common";
 
 /* global $, Session */
 /* eslint-disable no-console */
@@ -562,6 +562,32 @@ const setDefaultView = function () {
   window.onbeforeunload = null;
 };
 
+const graphPlotly = function () {
+  // get plot info
+  const route = Session.get("route");
+
+  // get dataset info and options
+  const resultSet = matsCurveUtils.getGraphResult();
+  if (resultSet === null || resultSet === undefined || resultSet.data === undefined) {
+    return false;
+  }
+
+  // set options
+  const { options } = resultSet;
+  if (route !== undefined && route !== "") {
+    options.selection = [];
+  }
+
+  // initialize show/hide button labels
+  const dataset = resultSet.data;
+  if (Session.get("graphPlotType") !== matsTypes.PlotTypes.map) {
+    setNoDataLabels(dataset);
+  } else {
+    setNoDataLabelsMap(dataset);
+  }
+  return null;
+};
+
 const downloadFile = function (fileURL, fileName) {
   // for non-IE
   if (!window.ActiveXObject) {
@@ -609,6 +635,7 @@ export default matsGraphUtils = {
   setGraphView,
   standAloneSetGraphView,
   setDefaultView,
+  graphPlotly,
   downloadFile,
   setScorecardDisplayView,
 };
diff --git a/meteor_packages/mats-common/imports/startup/client/routes.js b/meteor_packages/mats-common/imports/startup/client/routes.js
index aca60f44c..26ddabdf3 100644
--- a/meteor_packages/mats-common/imports/startup/client/routes.js
+++ b/meteor_packages/mats-common/imports/startup/client/routes.js
@@ -44,7 +44,7 @@ FlowRouter.route("/JSON/:graphFunction/:key/:matching/:appName", {
 FlowRouter.route("/preview/:graphFunction/:key/:matching/:appName", {
   name: "preview",
   action(params) {
-    this.render("GraphStandAlone", params);
+    this.render("graphStandAlone", params);
   },
 });
 
@@ -111,7 +111,7 @@ FlowRouter.route(
   {
     name: "preview",
     action(params) {
-      this.render("GraphStandAlone", params);
+      this.render("graphStandAlone", params);
     },
   }
 );
@@ -185,7 +185,7 @@ FlowRouter.route(
   {
     name: "preview",
     action(params) {
-      this.render("GraphStandAlone", params);
+      this.render("graphStandAlone", params);
     },
   }
 );
diff --git a/meteor_packages/mats-common/imports/startup/client/select_util.js b/meteor_packages/mats-common/imports/startup/client/select_util.js
index 2860281a1..2c43088c8 100644
--- a/meteor_packages/mats-common/imports/startup/client/select_util.js
+++ b/meteor_packages/mats-common/imports/startup/client/select_util.js
@@ -9,28 +9,7 @@ import {
   matsTypes,
 } from "meteor/randyp:mats-common";
 
-// method to refresh the peers of the current selector
-const refreshPeer = function (event, param) {
-  try {
-    const { peerName } = param;
-    if (peerName !== undefined) {
-      // refresh the peer
-      const targetParam = matsParamUtils.getParameterForName(peerName);
-      const targetId = `${targetParam.name}-${targetParam.type}`;
-      const targetElem = document.getElementById(targetId);
-      const refreshMapEvent = new CustomEvent("refresh", {
-        detail: {
-          refElement: null,
-        },
-      });
-      targetElem.dispatchEvent(refreshMapEvent);
-    }
-    refreshDependents(event, param);
-  } catch (e) {
-    e.message = `INFO: Error in select.js refreshPeer: ${e.message}`;
-    setInfo(e.message);
-  }
-};
+/* global $, _, Session, setInfo */
 
 // method to refresh the dependents of the current selector
 const refreshDependents = function (event, param) {
@@ -43,10 +22,10 @@ const refreshDependents = function (event, param) {
     ) {
       // refresh the dependents
       let selectAllbool = false;
-      for (let i = 0; i < dependentNames.length; i++) {
+      for (let i = 0; i < dependentNames.length; i += 1) {
         const name = dependentNames[i];
         const targetParam = matsParamUtils.getParameterForName(name);
-        var targetId;
+        let targetId;
         if (targetParam.type === matsTypes.InputTypes.dateRange) {
           targetId = `element-${targetParam.name}`;
         } else {
@@ -75,14 +54,14 @@ const refreshDependents = function (event, param) {
         const select = true;
         if (targetElem.multiple && elements !== undefined && elements.length > 0) {
           if (selectAllbool) {
-            for (let i1 = 0; i1 < elements.length; i1++) {
+            for (let i1 = 0; i1 < elements.length; i1 += 1) {
               elements[i1].selected = select;
             }
             matsParamUtils.setValueTextForParamName(name, "");
           } else {
-            const previously_selected = Session.get("selected");
-            for (let i2 = 0; i2 < elements.length; i2++) {
-              if (_.indexOf(previously_selected, elements[i2].text) !== -1) {
+            const previouslySelected = Session.get("selected");
+            for (let i2 = 0; i2 < elements.length; i2 += 1) {
+              if (_.indexOf(previouslySelected, elements[i2].text) !== -1) {
                 elements[i2].selected = select;
               }
             }
@@ -96,6 +75,29 @@ const refreshDependents = function (event, param) {
   }
 };
 
+// method to refresh the peers of the current selector
+const refreshPeer = function (event, param) {
+  try {
+    const { peerName } = param;
+    if (peerName !== undefined) {
+      // refresh the peer
+      const targetParam = matsParamUtils.getParameterForName(peerName);
+      const targetId = `${targetParam.name}-${targetParam.type}`;
+      const targetElem = document.getElementById(targetId);
+      const refreshMapEvent = new CustomEvent("refresh", {
+        detail: {
+          refElement: null,
+        },
+      });
+      targetElem.dispatchEvent(refreshMapEvent);
+    }
+    refreshDependents(event, param);
+  } catch (e) {
+    e.message = `INFO: Error in select.js refreshPeer: ${e.message}`;
+    setInfo(e.message);
+  }
+};
+
 // check for enable controlled - This select might have control of another selector
 const checkDisableOther = function (param, firstRender) {
   try {
@@ -103,7 +105,7 @@ const checkDisableOther = function (param, firstRender) {
       // this param controls the enable/disable properties of at least one other param.
       // Use the options to enable disable that param.
       const controlledSelectors = Object.keys(param.disableOtherFor);
-      for (let i = 0; i < controlledSelectors.length; i++) {
+      for (let i = 0; i < controlledSelectors.length; i += 1) {
         const elem = matsParamUtils.getInputElementForParamName(param.name);
         if (!elem) {
           return;
@@ -142,7 +144,7 @@ const checkHideOther = function (param, firstRender) {
     if (param.hideOtherFor !== undefined) {
       // this param controls the visibility of at least one other param.
       const controlledSelectors = Object.keys(param.hideOtherFor);
-      for (let i = 0; i < controlledSelectors.length; i++) {
+      for (let i = 0; i < controlledSelectors.length; i += 1) {
         const elem = matsParamUtils.getInputElementForParamName(param.name);
         if (!elem) {
           return;
@@ -151,7 +153,7 @@ const checkHideOther = function (param, firstRender) {
         let selectedText;
         if (param.type === matsTypes.InputTypes.radioGroup) {
           const radioButtons = elem.getElementsByTagName("input");
-          for (let ridx = 0; ridx < radioButtons.length; ridx++) {
+          for (let ridx = 0; ridx < radioButtons.length; ridx += 1) {
             if (radioButtons[ridx].checked) {
               selectedOptions = radioButtons[ridx].id.split("-radioGroup-");
               selectedText = selectedOptions[selectedOptions.length - 1];
@@ -174,7 +176,7 @@ const checkHideOther = function (param, firstRender) {
           param.superiorRadioGroups !== undefined
         ) {
           // if a superior radio group wants the target element hidden and it already is, leave it be.
-          for (let sidx = 0; sidx < param.superiorRadioGroups.length; sidx++) {
+          for (let sidx = 0; sidx < param.superiorRadioGroups.length; sidx += 1) {
             const superiorName = param.superiorRadioGroups[sidx];
             const superiorHideOtherFor = matsCollections.PlotParams.findOne({
               name: superiorName,
@@ -183,10 +185,14 @@ const checkHideOther = function (param, firstRender) {
               .getInputElementForParamName(superiorName)
               .getElementsByTagName("input");
             let superiorSelectedText = "";
-            for (let sidx = 0; sidx < superiorInputElementOptions.length; sidx++) {
-              if (superiorInputElementOptions[sidx].checked) {
+            for (
+              let seidx = 0;
+              seidx < superiorInputElementOptions.length;
+              seidx += 1
+            ) {
+              if (superiorInputElementOptions[seidx].checked) {
                 const superiorSelectedOptions =
-                  superiorInputElementOptions[sidx].id.split("-radioGroup-");
+                  superiorInputElementOptions[seidx].id.split("-radioGroup-");
                 superiorSelectedText =
                   superiorSelectedOptions[superiorSelectedOptions.length - 1];
                 break;
@@ -208,7 +214,7 @@ const checkHideOther = function (param, firstRender) {
         const otherInputElement = matsParamUtils.getInputElementForParamName(
           controlledSelectors[i]
         );
-        var selectorControlElem;
+        let selectorControlElem;
         if (
           (firstRender &&
             param.default.toString() ===
@@ -242,10 +248,13 @@ const checkHideOther = function (param, firstRender) {
               selectorControlElem.purposelyHidden = false;
             }
           }
-          otherInputElement &&
+          if (
+            otherInputElement &&
             otherInputElement.options &&
-            otherInputElement.selectedIndex >= 0 &&
+            otherInputElement.selectedIndex >= 0
+          ) {
             otherInputElement.options[otherInputElement.selectedIndex].scrollIntoView();
+          }
         }
       }
       checkDisableOther(param, firstRender);
@@ -301,30 +310,30 @@ const refresh = function (event, paramName) {
     if (superiorDimensionality === 1) {
       sNames = superiorNames;
     } else {
-      sNames = superiorNames[0];
+      [sNames] = superiorNames;
     }
-    for (var sn = 0; sn < sNames.length; sn++) {
-      var superiorElement = matsParamUtils.getInputElementForParamName(sNames[sn]);
-      var selectedSuperiorValue =
+    for (let sn = 0; sn < sNames.length; sn += 1) {
+      const superiorElement = matsParamUtils.getInputElementForParamName(sNames[sn]);
+      let selectedSuperiorValue =
         superiorElement.options[superiorElement.selectedIndex] === undefined
           ? matsParamUtils.getParameterForName(sNames[sn]).default
           : superiorElement.options[superiorElement.selectedIndex].text;
       if (sNames[sn].includes("statistic") && isMetexpress) {
-        selectedSuperiorValue = statisticTranslations[selectedSuperiorValue][0];
+        [selectedSuperiorValue] = statisticTranslations[selectedSuperiorValue];
       }
       superiors[0] = superiors[0] === undefined ? [] : superiors[0];
       superiors[0].push({ element: superiorElement, value: selectedSuperiorValue });
     }
-    for (var sNameIndex = 1; sNameIndex < superiorDimensionality; sNameIndex++) {
+    for (let sNameIndex = 1; sNameIndex < superiorDimensionality; sNameIndex += 1) {
       sNames = superiorNames[sNameIndex];
-      for (var sn = 0; sn < sNames.length; sn++) {
-        var superiorElement = matsParamUtils.getInputElementForParamName(sNames[sn]);
-        var selectedSuperiorValue =
+      for (let sn = 0; sn < sNames.length; sn += 1) {
+        const superiorElement = matsParamUtils.getInputElementForParamName(sNames[sn]);
+        let selectedSuperiorValue =
           superiorElement.options[superiorElement.selectedIndex] === undefined
             ? matsParamUtils.getParameterForName(sNames[sn]).default
             : superiorElement.options[superiorElement.selectedIndex].text;
         if (sNames[sn].includes("statistic") && isMetexpress) {
-          selectedSuperiorValue = statisticTranslations[selectedSuperiorValue][0];
+          [selectedSuperiorValue] = statisticTranslations[selectedSuperiorValue];
         }
         superiors[sNameIndex] =
           superiors[sNameIndex] === undefined ? [] : superiors[sNameIndex];
@@ -409,7 +418,7 @@ const refresh = function (event, paramName) {
     }
 
     const brothers = [];
-    for (var i = 0; i < elems.length; i++) {
+    for (let i = 0; i < elems.length; i += 1) {
       if (elems[i].id.indexOf(name) >= 0 && elems[i].id !== elem.id)
         brothers.push(elems[i]);
     }
@@ -424,15 +433,15 @@ const refresh = function (event, paramName) {
       // These are the ancestral options.
       if (param.optionsMap) {
         let firstSuperiorOptions = optionsMap;
-        var theseSuperiors =
+        const theseSuperiors =
           superiors === undefined || superiors.length === 0 ? [] : superiors[0];
         for (
-          var theseSuperiorsIndex = 0;
+          let theseSuperiorsIndex = 0;
           theseSuperiorsIndex < theseSuperiors.length;
-          theseSuperiorsIndex++
+          theseSuperiorsIndex += 1
         ) {
-          var superior = theseSuperiors[theseSuperiorsIndex];
-          var selectedSuperiorValue = superior.value;
+          const superior = theseSuperiors[theseSuperiorsIndex];
+          const selectedSuperiorValue = superior.value;
           if (isScorecard) {
             firstSuperiorOptions =
               firstSuperiorOptions[selectedSuperiorValue] !== undefined
@@ -483,29 +492,29 @@ const refresh = function (event, paramName) {
              */
 
       // need to get the actual options here
-      for (var sNameIndex = 1; sNameIndex < superiorDimensionality; sNameIndex++) {
+      for (let sNameIndex = 1; sNameIndex < superiorDimensionality; sNameIndex += 1) {
         // index down through the options for the list of superiors
         // starting with the most superior down through the least superior
         // and get the options list for the first set of superiors.
         // These are the ancestral options.
         let nextSuperiorOptions = optionsMap;
-        var theseSuperiors =
+        const theseSuperiors =
           superiors === undefined || superiors.length === 0
             ? []
             : superiors[sNameIndex];
         for (
-          var theseSuperiorsIndex = 0;
+          let theseSuperiorsIndex = 0;
           theseSuperiorsIndex < theseSuperiors.length;
-          theseSuperiorsIndex++
+          theseSuperiorsIndex += 1
         ) {
-          var superior = theseSuperiors[theseSuperiorsIndex];
-          var selectedSuperiorValue = superior.value;
+          const superior = theseSuperiors[theseSuperiorsIndex];
+          const selectedSuperiorValue = superior.value;
           nextSuperiorOptions = nextSuperiorOptions[selectedSuperiorValue];
         }
         // since we now have multiple options we have to intersect them
         myOptions = _.intersection(myOptions, nextSuperiorOptions);
       }
-      if (myOptions === []) {
+      if (myOptions && myOptions.length === 0) {
         // none used - set to []
         matsParamUtils.setValueTextForParamName(name, matsTypes.InputTypes.unused);
       }
@@ -525,7 +534,7 @@ const refresh = function (event, paramName) {
           // optionGroups are an ordered map. It probably has options that are in the disabledOption list
           // which are used as markers in the select options pulldown. This is typical for models
           const optionsGroupsKeys = Object.keys(optionsGroups);
-          for (let k = 0; k < optionsGroupsKeys.length; k++) {
+          for (let k = 0; k < optionsGroupsKeys.length; k += 1) {
             if (myOptions === null) {
               myOptions = [];
               myOptions.push(optionsGroupsKeys[k]);
@@ -544,7 +553,7 @@ const refresh = function (event, paramName) {
         return;
       }
       let firstGroup = true;
-      for (var i = 0; i < myOptions.length; i++) {
+      for (let i = 0; i < myOptions.length; i += 1) {
         const dIndex =
           disabledOptions === undefined ? -1 : disabledOptions.indexOf(myOptions[i]);
         if (dIndex >= 0) {
@@ -621,8 +630,8 @@ const refresh = function (event, paramName) {
           );
         }
         if (elem.selectedIndex >= 0) {
-          for (let svi = 0; svi < selectedSuperiorValues.length; svi++) {
-            superior = superiors[svi];
+          for (let svi = 0; svi < selectedSuperiorValues.length; svi += 1) {
+            const superior = superiors[svi];
             if (
               matsParamUtils.getControlElementForParamName(superior.element.name)
                 .offsetParent !== null
@@ -646,17 +655,15 @@ const refresh = function (event, paramName) {
           matsParamUtils.setValueTextForParamName(name, matsTypes.InputTypes.unused);
         } else {
           elem.selectedIndex = 0;
-          elem &&
-            elem.options &&
-            elem.selectedIndex >= 0 &&
+          if (elem && elem.options && elem.selectedIndex >= 0) {
             elem.options[elem.selectedIndex].scrollIntoView();
-          elem &&
-            elem.options &&
-            elem.selectedIndex >= 0 &&
+          }
+          if (elem && elem.options && elem.selectedIndex >= 0) {
             matsParamUtils.setValueTextForParamName(
               name,
               elem.options[elem.selectedIndex].text
             );
+          }
         }
       } else if (param.multiple && selectedOptionOverlap.length > 0) {
         // need to manually select all the desired options
@@ -677,19 +684,17 @@ const refresh = function (event, paramName) {
         matsParamUtils.setValueTextForParamName(name, selectedOptionOverlap);
       } else {
         elem.selectedIndex = selectedOptionIndex;
-        elem &&
-          elem.options &&
-          elem.selectedIndex >= 0 &&
+        if (elem && elem.options && elem.selectedIndex >= 0) {
           elem.options[elem.selectedIndex].scrollIntoView();
-        elem &&
-          elem.options &&
-          elem.selectedIndex >= 0 &&
+        }
+        if (elem && elem.options && elem.selectedIndex >= 0) {
           matsParamUtils.setValueTextForParamName(
             name,
             elem.options[elem.selectedIndex].text
           );
+        }
       }
-      for (var i = 0; i < brothers.length; i++) {
+      for (let i = 0; i < brothers.length; i += 1) {
         const belem = brothers[i];
         const belemSelectedOptions = $(belem.selectedOptions)
           .map(function () {
@@ -698,7 +703,7 @@ const refresh = function (event, paramName) {
           .get();
         if (belemSelectedOptions === undefined || belemSelectedOptions.length === 0) {
           belem.options = [];
-          for (let i1 = 0; i1 < myOptions.length; i1++) {
+          for (let i1 = 0; i1 < myOptions.length; i1 += 1) {
             belem.options[belem.options.length] = new Option(
               myOptions[i1],
               myOptions[i1],
@@ -715,10 +720,11 @@ const refresh = function (event, paramName) {
   }
   // These need to be done in the right order!
   // always check to see if an "other" needs to be hidden or disabled before refreshing
-  matsSelectUtils.checkHideOther(param, false);
+  checkHideOther(param, false);
   refreshPeer(event, param);
 }; // refresh function
 
+// eslint-disable-next-line no-undef
 export default matsSelectUtils = {
   refresh,
   refreshPeer,
diff --git a/meteor_packages/mats-common/imports/startup/server/data_util.js b/meteor_packages/mats-common/imports/startup/server/data_util.js
index 677d14bb7..84b685db1 100644
--- a/meteor_packages/mats-common/imports/startup/server/data_util.js
+++ b/meteor_packages/mats-common/imports/startup/server/data_util.js
@@ -6,6 +6,7 @@ import { matsTypes, matsCollections, matsMethods } from "meteor/randyp:mats-comm
 import { Meteor } from "meteor/meteor";
 import { HTTP } from "meteor/jkuester:http";
 
+/* global Npm */
 /* eslint-disable global-require */
 /* eslint-disable no-console */
 
@@ -383,7 +384,6 @@ const doSettings = function (
     metexpress: "production",
   };
   const settingsId = settings._id;
-  // eslint-disable-next-line no-undef
   const os = Npm.require("os");
   const hostname = os.hostname().split(".")[0];
   settings.appVersion = version;
diff --git a/meteor_packages/mats-common/imports/startup/server/publications.js b/meteor_packages/mats-common/imports/startup/server/publications.js
index bf4fe60d5..c3077c1f5 100644
--- a/meteor_packages/mats-common/imports/startup/server/publications.js
+++ b/meteor_packages/mats-common/imports/startup/server/publications.js
@@ -8,7 +8,7 @@ import { curveParamsByApp } from "../both/mats-curve-params";
 
 /* eslint-disable no-console */
 
-const _publishField = function (field) {
+const publishField = function (field) {
   Meteor.publish(field, function () {
     const data = matsCollections[field].find({});
     if (data) {
@@ -31,7 +31,7 @@ if (Meteor.isServer) {
   let currParam;
   for (let i = 0; i < params.length; i += 1) {
     currParam = params[i];
-    _publishField(currParam);
+    publishField(currParam);
   }
   Meteor.publish("CurveParamsInfo", function () {
     const data = matsCollections.CurveParamsInfo.find({});
diff --git a/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.html b/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.html
index 2ba533c6b..c2439122e 100644
--- a/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.html
+++ b/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.html
@@ -1,3 +1,3 @@
-<template name="AppBody">
+<template name="appBody">
   <div>{{> Template.dynamic template=main}}</div>
 </template>
diff --git a/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.js b/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.js
index fb5f65364..5146c1c54 100644
--- a/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.js
+++ b/meteor_packages/mats-common/imports/startup/ui/layouts/appBody.js
@@ -2,10 +2,13 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 
+/* eslint-disable no-unused-vars */
+/* eslint-disable no-console */
+
 import { Template } from "meteor/templating";
 import { FlowRouter } from "meteor/ostrio:flow-router-extra";
 import "./appBody.html";
 
-Template.AppBody.onCreated(function () {
-  console.log("in AppBody onCreated");
+Template.appBody.onCreated(function () {
+  console.log("in appBody onCreated");
 });
diff --git a/meteor_packages/mats-common/lib/math_util.js b/meteor_packages/mats-common/lib/math_util.js
deleted file mode 100644
index 135f71d9d..000000000
--- a/meteor_packages/mats-common/lib/math_util.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
- */
-
-/*
-generic Math Functions
- */
-const isNum = function (args) {
-  if (args === null || args === undefined) {
-    return false;
-  }
-  args = args.toString();
-  if (args.length === 0) return false;
-
-  for (let i = 0; i < args.length; i++) {
-    if (
-      (args.substring(i, i + 1) < "0" || args.substring(i, i + 1) > "9") &&
-      args.substring(i, i + 1) !== "." &&
-      args.substring(i, i + 1) !== "-"
-    ) {
-      return false;
-    }
-  }
-
-  return true;
-};
-
-const mean = function (arr) {
-  let len = 0;
-  let sum = 0;
-
-  for (let i = 0; i < arr.length; i++) {
-    if (arr[i] === "") {
-    } else if (!isNum(arr[i])) {
-      // alert(arr[i] + " is not number!");
-      console.log(
-        `Error: value at position: ${i} is not number! Mean Calculation failed!`
-      );
-      return 0;
-    } else {
-      len += 1;
-      sum += parseFloat(arr[i]);
-    }
-  }
-  return sum / len;
-};
-
-const variance = function (arr) {
-  let len = 0;
-  let sum = 0;
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i] === "") {
-    } else if (!isNum(arr[i])) {
-      // alert(arr[i] + " is not number, Variance Calculation failed!");
-      console.log(`value at position ${i} is not number, Variance Calculation failed!`);
-      return 0;
-    } else {
-      len += 1;
-      sum += parseFloat(arr[i]);
-    }
-  }
-
-  let v = 0;
-  if (len > 1) {
-    const mean = sum / len;
-    for (var i = 0; i < arr.length; i++) {
-      if (arr[i] === "") {
-      } else {
-        v += (arr[i] - mean) * (arr[i] - mean);
-      }
-    }
-
-    return v / len;
-  }
-  return 0;
-};
-
-const median = function (arr) {
-  arr.sort(function (a, b) {
-    return a - b;
-  });
-
-  let median = 0;
-
-  if (arr.length % 2 === 1) {
-    median = arr[(arr.length + 1) / 2 - 1];
-  } else {
-    median = (1 * arr[arr.length / 2 - 1] + 1 * arr[arr.length / 2]) / 2;
-  }
-
-  return median;
-};
-
-export default matsMathUtils = {
-  isNum,
-  mean,
-  variance,
-  median,
-};
diff --git a/meteor_packages/mats-common/lib/param_util.js b/meteor_packages/mats-common/lib/param_util.js
index 4f5cd5aca..b56e0dc46 100644
--- a/meteor_packages/mats-common/lib/param_util.js
+++ b/meteor_packages/mats-common/lib/param_util.js
@@ -2,11 +2,16 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 
+/* global $, Session */
+/* eslint-disable no-console */
+
 import {
   matsTypes,
   matsCollections,
+  matsMethods,
   matsPlotUtils,
   matsCurveUtils,
+  matsSelectUtils,
 } from "meteor/randyp:mats-common";
 import { moment } from "meteor/momentjs:moment";
 
@@ -21,6 +26,7 @@ const getControlButtonIdForParamName = function (paramName) {
       return id;
     }
   }
+  return null;
 };
 
 // get the control Button Element that corresponds to the param name
@@ -30,6 +36,13 @@ const getControlElementForParamName = function (paramName) {
   return document.getElementById(getControlButtonIdForParamName(pname));
 };
 
+// get the VALUE BOX id for the element that corresponds to the param name
+const getValueIdForParamName = function (paramName) {
+  // scatter axis don't really exist in CurveParams-related matsCollections but they are elements
+  const pname = paramName.replace(/^.axis-/, "");
+  return `controlButton-${pname}-value`;
+};
+
 // get the document element that corresponds to the param name
 const getValueElementForParamName = function (paramName) {
   // scatter axis don't really exist in CurveParams-related matsCollections but they are elements
@@ -42,24 +55,50 @@ const getValueElementForParamName = function (paramName) {
 // Note that the value should be reflected in the adjoining control button value textContent.
 const getValueForParamName = function (paramName) {
   try {
-    const elem = getValueElementForParamName(paramName);
     return getValueElementForParamName(paramName).textContent.trim();
   } catch (error) {
     return undefined;
   }
 };
 
-// get the VALUE BOX id for the element that corresponds to the param name
-const getValueIdForParamName = function (paramName) {
+// get the document id for the element that corresponds to the param name
+const getInputIdForParamName = function (paramName) {
   // scatter axis don't really exist in CurveParams-related matsCollections but they are elements
   const pname = paramName.replace(/^.axis-/, "");
-  return `controlButton-${pname}-value`;
+  let param;
+  if (matsCollections[pname] !== undefined) {
+    param = matsCollections[pname].findOne({ name: pname });
+  }
+  if (param === undefined) {
+    param = matsCollections.PlotParams.findOne({ name: pname });
+  }
+  if (param === undefined) {
+    param = matsCollections.Scatter2dParams.findOne({ name: pname });
+    if (param === undefined) {
+      return undefined;
+    }
+  }
+  if (param.type === matsTypes.InputTypes.dateRange) {
+    return `element-${param.name}`.replace(/ /g, "-");
+  }
+  return `${param.name}-${param.type}`.replace(/ /g, "-");
+};
+
+// get the document element that corresponds to the param name
+const getInputElementForParamName = function (paramName) {
+  const name = paramName.replace(/^.axis-/, "");
+  const id = getInputIdForParamName(name);
+  if (id === undefined) {
+    return undefined;
+  }
+  return document.getElementById(id);
 };
 
 // set the VALUE BOX text for the element that corresponds to the param name
 const setValueTextForParamName = function (paramName, text) {
   try {
     let param;
+    let thisText = text;
     if (matsCollections[paramName] !== undefined) {
       param = matsCollections[paramName].findOne({ name: paramName });
     }
@@ -69,25 +108,25 @@ const setValueTextForParamName = function (paramName, text) {
     if (param === undefined) {
       return;
     }
-    if (text === undefined) {
+    if (thisText === undefined) {
       if (param.multiple) {
         // .... if multi selected  get the first .. last
         const selection = getInputElementForParamName(paramName).selectedOptions;
         if (selection.length === 0) {
-          text = "";
+          thisText = "";
         } else if (selection.length === 1) {
-          text = selection[0].textContent;
+          thisText = selection[0].textContent;
         } else {
-          text = `${selection[0].textContent} .. ${
+          thisText = `${selection[0].textContent} .. ${
             selection[selection.length - 1].textContent
           }`;
         }
       }
     }
     const elem = getValueElementForParamName(paramName);
-    if (elem && elem.textContent !== text) {
+    if (elem && elem.textContent !== thisText) {
       delete elem.textContent;
-      elem.textContent = text;
+      elem.textContent = thisText;
     }
     if (
       paramName.includes("dates") &&
@@ -95,36 +134,13 @@ const setValueTextForParamName = function (paramName, text) {
       document.getElementById(`${paramName}-dateRange`) !== null
     ) {
       delete document.getElementById(`${paramName}-dateRange`).value;
-      document.getElementById(`${paramName}-dateRange`).value = text;
+      document.getElementById(`${paramName}-dateRange`).value = thisText;
     }
   } catch (error) {
     console.log(`Error: could not find param: ${paramName}`);
   }
 };
 
-// get the document id for the element that corresponds to the param name
-const getInputIdForParamName = function (paramName) {
-  // scatter axis don't really exist in CurveParams-related matsCollections but they are elements
-  const pname = paramName.replace(/^.axis-/, "");
-  let param;
-  if (matsCollections[pname] !== undefined) {
-    param = matsCollections[pname].findOne({ name: pname });
-  }
-  if (param === undefined) {
-    param = matsCollections.PlotParams.findOne({ name: pname });
-  }
-  if (param === undefined) {
-    param = matsCollections.Scatter2dParams.findOne({ name: pname });
-    if (param === undefined) {
-      return undefined;
-    }
-  }
-  if (param.type === matsTypes.InputTypes.dateRange) {
-    return `element-${param.name}`.replace(/ /g, "-");
-  }
-  return `${param.name}-${param.type}`.replace(/ /g, "-");
-};
-
 // get the parameter for the element that corresponds to the param name
 const getParameterForName = function (paramName) {
   // scatter axis don't really exist in CurveParams-related matsCollections but they are elements
@@ -146,16 +162,6 @@ const getParameterForName = function (paramName) {
   return param;
 };
 
-// get the document element that corresponds to the param name
-const getInputElementForParamName = function (paramName) {
-  const name = paramName.replace(/^.axis-/, "");
-  const id = getInputIdForParamName(name);
-  if (id === undefined) {
-    return undefined;
-  }
-  return document.getElementById(id);
-};
-
 // get a param disabledOptions list - if any.
 const getDisabledOptionsForParamName = function (paramName) {
   const name = paramName.replace(/^.axis-/, "");
@@ -198,14 +204,14 @@ const getElementValues = function () {
     curve_params: { $exists: true },
   }).fetch()[0].curve_params;
   let param;
-  for (let pidx = 0; pidx < params.length; pidx++) {
-    param = matsCollections[params[pidx]].find({}).fetch()[0];
-    var val = "";
+  for (let pidx = 0; pidx < params.length; pidx += 1) {
+    [param] = matsCollections[params[pidx]].find({}).fetch();
+    let val = "";
     if (param.type === matsTypes.InputTypes.radioGroup) {
-      var selector = `input:radio[name='${param.name}']:checked`;
+      const selector = `input:radio[name='${param.name}']:checked`;
       val = $(selector).val();
     } else if (param.type === matsTypes.InputTypes.checkBoxGroup) {
-      var selector = `input[name='${param.name}']:checked`;
+      const selector = `input[name='${param.name}']:checked`;
       val = $(selector)
         .map(function (_, el) {
           return $(el).val();
@@ -214,27 +220,27 @@ const getElementValues = function () {
     } else if (param.type === matsTypes.InputTypes.dateRange) {
       val = getValueForParamName(param.name);
     } else {
-      var idSelect = `#${getInputIdForParamName(param.name)}`;
+      const idSelect = `#${getInputIdForParamName(param.name)}`;
       val = $(idSelect).val();
     }
     data.curveParams[param.name] = val;
     if (matsPlotUtils.getPlotType() === matsTypes.PlotTypes.scatter2d) {
-      for (let a = 0; a < axis.length; a++) {
+      for (let a = 0; a < axis.length; a += 1) {
         const axisStr = axis[a];
         const name = axisStr + param.name;
-        var val = "";
+        val = "";
         if (param.type === matsTypes.InputTypes.radioGroup) {
-          var selector = `input:radio[name='${name}']:checked`;
+          const selector = `input:radio[name='${name}']:checked`;
           val = $(selector).val();
         } else if (param.type === matsTypes.InputTypes.checkBoxGroup) {
-          var selector = `input[name='${name}']:checked`;
+          const selector = `input[name='${name}']:checked`;
           val = $(selector)
             .map(function (_, el) {
               return $(el).val();
             })
             .get();
         } else {
-          var idSelect = `#${getInputIdForParamName(name)}`;
+          const idSelect = `#${getInputIdForParamName(name)}`;
           val = $(idSelect).val();
         }
         data.curveParams[name] = val;
@@ -243,66 +249,66 @@ const getElementValues = function () {
   }
 
   params = matsCollections.PlotParams.find({}).fetch();
-  params.forEach(function (param) {
+  params.forEach(function (p) {
     let val = "";
-    if (param.type === matsTypes.InputTypes.radioGroup) {
-      var selector = `input:radio[name='${param.name}']:checked`;
+    if (p.type === matsTypes.InputTypes.radioGroup) {
+      const selector = `input:radio[name='${p.name}']:checked`;
       val = $(selector).val();
-    } else if (param.type === matsTypes.InputTypes.checkBoxGroup) {
-      var selector = `input[name='${param.name}']:checked`;
+    } else if (p.type === matsTypes.InputTypes.checkBoxGroup) {
+      const selector = `input[name='${p.name}']:checked`;
       val = $(selector)
         .map(function (_, el) {
           return $(el).val();
         })
         .get();
-    } else if (param.type === matsTypes.InputTypes.color) {
-      val = document.querySelector(`[name='${param.name}-icon']`).style.color;
+    } else if (p.type === matsTypes.InputTypes.color) {
+      val = document.querySelector(`[name='${p.name}-icon']`).style.color;
     } else {
-      const idSelect = `#${getInputIdForParamName(param.name)}`;
+      const idSelect = `#${getInputIdForParamName(p.name)}`;
       val = $(idSelect).val();
     }
-    data.plotParams[param.name] = val;
+    data.plotParams[p.name] = val;
   });
 
   params = matsCollections.Scatter2dParams.find({}).fetch();
-  params.forEach(function (param) {
-    var val = "";
-    if (param.type === matsTypes.InputTypes.radioGroup) {
-      var selector = `input:radio[name='${param.name}']:checked`;
+  params.forEach(function (p) {
+    let val = "";
+    if (p.type === matsTypes.InputTypes.radioGroup) {
+      const selector = `input:radio[name='${p.name}']:checked`;
       val = $(selector).val();
-    } else if (param.type === matsTypes.InputTypes.checkBoxGroup) {
-      var selector = `input[name='${param.name}']:checked`;
+    } else if (p.type === matsTypes.InputTypes.checkBoxGroup) {
+      const selector = `input[name='${p.name}']:checked`;
       val = $(selector)
         .map(function (_, el) {
           return $(el).val();
         })
         .get();
-    } else if (param.type === matsTypes.InputTypes.color) {
-      val = document.querySelector(`[name='${param.name}-icon']`).style.color;
+    } else if (p.type === matsTypes.InputTypes.color) {
+      val = document.querySelector(`[name='${p.name}-icon']`).style.color;
     } else {
-      var idSelect = `#${getInputIdForParamName(param.name)}`;
+      const idSelect = `#${getInputIdForParamName(p.name)}`;
       val = $(idSelect).val();
     }
-    data.scatterParams[param.name] = val;
+    data.scatterParams[p.name] = val;
     if (matsPlotUtils.getPlotType() === matsTypes.PlotTypes.scatter2d) {
-      for (let a = 0; a < axis.length; a++) {
+      for (let a = 0; a < axis.length; a += 1) {
         const axisStr = axis[a];
-        const name = axisStr + param.name;
-        var val = "";
-        if (param.type === matsTypes.InputTypes.radioGroup) {
-          var selector = `input:radio[name='${name}']:checked`;
+        const name = axisStr + p.name;
+        val = "";
+        if (p.type === matsTypes.InputTypes.radioGroup) {
+          const selector = `input:radio[name='${name}']:checked`;
           val = $(selector).val();
-        } else if (param.type === matsTypes.InputTypes.checkBoxGroup) {
-          var selector = `input[name='${name}']:checked`;
+        } else if (p.type === matsTypes.InputTypes.checkBoxGroup) {
+          const selector = `input[name='${name}']:checked`;
           val = $(selector)
             .map(function (_, el) {
               return $(el).val();
             })
             .get();
-        } else if (param.type === matsTypes.InputTypes.color) {
-          val = document.querySelector(`[name='${param.name}-icon']`).style.color;
+        } else if (p.type === matsTypes.InputTypes.color) {
+          val = document.querySelector(`[name='${p.name}-icon']`).style.color;
         } else {
-          var idSelect = `#${getInputIdForParamName(name)}`;
+          const idSelect = `#${getInputIdForParamName(name)}`;
           val = $(idSelect).val();
         }
         data.scatterParams[name] = val;
@@ -317,10 +323,10 @@ const expandParams = function () {
     curve_params: { $exists: true },
   }).fetch()[0].curve_params;
   let param;
-  for (let pidx = 0; pidx < params.length; pidx++) {
-    param = matsCollections[params[pidx]].find({}).fetch()[0];
+  for (let pidx = 0; pidx < params.length; pidx += 1) {
+    [param] = matsCollections[params[pidx]].find({}).fetch();
     if (param.type !== matsTypes.InputTypes.selectMap) {
-      const selector = `element` + `-${param.name}`;
+      const selector = `element-${param.name}`;
       const elem = document.getElementById(selector);
       if (elem) {
         elem.style.display = "block";
@@ -338,10 +344,10 @@ const collapseParams = function () {
     curve_params: { $exists: true },
   }).fetch()[0].curve_params;
   let param;
-  for (let pidx = 0; pidx < params.length; pidx++) {
-    param = matsCollections[params[pidx]].find({}).fetch()[0];
+  for (let pidx = 0; pidx < params.length; pidx += 1) {
+    [param] = matsCollections[params[pidx]].find({}).fetch();
     if (param.type !== matsTypes.InputTypes.selectMap) {
-      const selector = `element` + `-${param.name}`;
+      const selector = `element-${param.name}`;
       if (document.getElementById(selector)) {
         document.getElementById(selector).style.display = "none";
       }
@@ -358,7 +364,7 @@ const collapseParam = function (paramName) {
     return;
   }
   if (param.type !== matsTypes.InputTypes.selectMap) {
-    const selector = `element` + `-${param.name}`;
+    const selector = `element-${param.name}`;
     if (document.getElementById(selector)) {
       document.getElementById(selector).style.display = "none";
     }
@@ -370,7 +376,7 @@ const typeSort = function (arr) {
     return undefined;
   }
   return arr.sort(function (a, b) {
-    if (isNaN(Number(a) && isNaN(Number(b)))) {
+    if (matsMethods.isThisANaN(Number(a) && matsMethods.isThisANaN(Number(b)))) {
       // string compare
       const A = a.toLowerCase();
       const B = b.toLowerCase();
@@ -382,9 +388,9 @@ const typeSort = function (arr) {
       }
       return 0;
     }
-    if (isNaN(Number(a) || isNaN(Number(b)))) {
+    if (matsMethods.isThisANaN(Number(a) || matsMethods.isThisANaN(Number(b)))) {
       // number always precedes
-      if (isNaN(Number(a))) {
+      if (matsMethods.isThisANaN(Number(a))) {
         return 1;
       }
       return -1;
@@ -471,7 +477,7 @@ const setAllParamsToDefault = function () {
   const superiors = [];
   const dependents = [];
   // get all of the curve param collections in one place
-  for (let pidx = 0; pidx < paramNames.length; pidx++) {
+  for (let pidx = 0; pidx < paramNames.length; pidx += 1) {
     const param = matsCollections[paramNames[pidx]].find({}).fetch()[0];
     // superiors
     if (param !== undefined && param.dependentNames !== undefined) {
@@ -573,7 +579,7 @@ const getOptionsMapForParam = function (paramName) {
     param = matsCollections.PlotParams.findOne({ name: paramName });
   }
   if (param === undefined) {
-    return;
+    return undefined;
   }
   return param.optionsMap;
 };
@@ -587,7 +593,7 @@ const getOptionsForParam = function (paramName) {
     param = matsCollections.PlotParams.findOne({ name: paramName });
   }
   if (param === undefined) {
-    return;
+    return undefined;
   }
   return param.options;
 };
@@ -597,16 +603,6 @@ const getAppName = function () {
   return app;
 };
 
-const getCurveItemValueForParamName = function (curveNumber, paramName) {
-  // MODEL-curve-0-Item
-  //    const id = paramName.toString().toUpperCase() + "-curve-" + curveNumber + "-Item"; // the id of the text span for a curveItem
-  //    return text = ‌‌document.getElementById(id).innerText;
-  // const elem = $("#" + id);
-  // var text = undefined;
-  // if (elem) {
-  //     text = elem.text();
-  // }
-};
 const visibilityControllerForParam = function (paramName) {
   /*
     Need to iterate all the params looking for one that has this paramName as a key in its
@@ -618,8 +614,8 @@ const visibilityControllerForParam = function (paramName) {
     curve_params: { $exists: true },
   }).fetch()[0].curve_params;
   let param;
-  for (let pidx = 0; pidx < params.length; pidx++) {
-    param = matsCollections[params[pidx]].find({}).fetch()[0];
+  for (let pidx = 0; pidx < params.length; pidx += 1) {
+    [param] = matsCollections[params[pidx]].find({}).fetch();
     if (param.hideOtherFor) {
       const pKeys = Object.keys(param.hideOtherFor);
       if (pKeys.indexOf(paramName) !== -1) {
@@ -631,30 +627,30 @@ const visibilityControllerForParam = function (paramName) {
   return found;
 };
 
-const getSingleSelectCurveParamNames = function () {
+const getMultiSelectCurveParamNames = function () {
   const curveParamNames = matsCollections.CurveParamsInfo.find(
     {},
     { curve_params: 1 }
   ).fetch()[0].curve_params;
-  const multiParamNames = getMultiSelectCurveParamNames();
-  const singleParamNames = curveParamNames.filter(function (n) {
-    return !multiParamNames.includes(n);
+  const multiParamNames = [];
+  curveParamNames.forEach(function (paramName) {
+    if (getParameterForName(paramName).multiple !== undefined) {
+      multiParamNames.push(paramName);
+    }
   });
-  return singleParamNames;
+  return multiParamNames;
 };
 
-const getMultiSelectCurveParamNames = function () {
+const getSingleSelectCurveParamNames = function () {
   const curveParamNames = matsCollections.CurveParamsInfo.find(
     {},
     { curve_params: 1 }
   ).fetch()[0].curve_params;
-  const multiParamNames = [];
-  curveParamNames.forEach(function (paramName) {
-    if (matsParamUtils.getParameterForName(paramName).multiple !== undefined) {
-      multiParamNames.push(paramName);
-    }
+  const multiParamNames = getMultiSelectCurveParamNames();
+  const singleParamNames = curveParamNames.filter(function (n) {
+    return !multiParamNames.includes(n);
   });
-  return multiParamNames;
+  return singleParamNames;
 };
 
 const getPlotParamNames = function () {
@@ -668,7 +664,7 @@ const addImportedCurve = function () {
   const curveParamNames = matsCollections.CurveParamsInfo.find({
     curve_params: { $exists: true },
   }).fetch()[0].curve_params;
-  for (let i = 0; i < curveParamNames.length; i++) {
+  for (let i = 0; i < curveParamNames.length; i += 1) {
     const currentParam = matsCollections[curveParamNames[i]].find({}).fetch()[0];
     if (
       currentParam.multiple &&
@@ -691,6 +687,7 @@ const addImportedCurve = function () {
   setInputForParamName("label", matsCurveUtils.getNextCurveLabel());
 };
 
+// eslint-disable-next-line no-undef
 export default matsParamUtils = {
   addImportedCurve,
   getDisabledOptionsForParamName,
@@ -717,7 +714,6 @@ export default matsParamUtils = {
   setInputValueForParamAndTriggerChange,
   getOptionsForParam,
   getOptionsMapForParam,
-  getCurveItemValueForParamName,
   visibilityControllerForParam,
   getAppName,
   getDefaultDateRange,
diff --git a/meteor_packages/mats-common/lib/plot_util.js b/meteor_packages/mats-common/lib/plot_util.js
index 5f2d7d973..99d48a4f0 100644
--- a/meteor_packages/mats-common/lib/plot_util.js
+++ b/meteor_packages/mats-common/lib/plot_util.js
@@ -2,29 +2,59 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 
-import { matsCollections, matsParamUtils, matsTypes } from "meteor/randyp:mats-common";
+import {
+  matsCollections,
+  matsParamUtils,
+  matsCurveUtils,
+  matsTypes,
+} from "meteor/randyp:mats-common";
+import { moment } from "meteor/momentjs:moment";
+
+/* global $, Session, _ */
 
 // determine the axisText (used in scatter_axis.js for example)
 // according to the Scatter Axis Text Patterns Pattern defined in
 // ScatterAxisTextPatterns according to plotType - and derived from
 // currently selected inputs in the document.
-const getAxisText = function (plotType) {
+// determine which plotType radio button is checked
+const getPlotType = function () {
+  return document.getElementById("plotTypes-selector")
+    ? document.getElementById("plotTypes-selector").value
+    : undefined;
+};
+
+// determine which plotFormat radio button is checked
+const getPlotFormat = function () {
+  const buttons = document.getElementsByName("plotFormat");
+  if (buttons === undefined) {
+    return ""; // app may not have plotFormat?
+  }
+  const plotFormatParam = matsCollections.PlotParams.findOne({ name: "plotFormat" });
+  if (plotFormatParam === undefined) {
+    return ""; // app may not have plotFormat?
+  }
+  for (let i = 0, len = buttons.length; i < len; i += 1) {
+    if (buttons[i].checked) {
+      return buttons[i].value;
+    }
+  }
+  return ""; // error condition actually - shouldn't ever happen
+};
+
+const getAxisText = function () {
   const scatterAxisTextPattern = matsCollections.ScatterAxisTextPattern.findOne({
     plotType: getPlotType(),
   });
-  const textPattern = scatterAxisTextPattern
-    ? matsCollections.ScatterAxisTextPattern.findOne({ plotType: getPlotType() })
-        .textPattern
-    : undefined;
   if (scatterAxisTextPattern === undefined) {
     return "";
   }
   let text = "";
-  for (let i = 0; i < scatterAxisTextPattern.length; i++) {
+  for (let i = 0; i < scatterAxisTextPattern.length; i += 1) {
     const pName = scatterAxisTextPattern[i][0];
     const delimiter = scatterAxisTextPattern[i][1];
-    let value = matsParamUtils.getValueForParamName(pName);
-    text += value += delimiter;
+    const value = matsParamUtils.getValueForParamName(pName);
+    text += value;
+    text += delimiter;
   }
   return text;
 };
@@ -37,18 +67,17 @@ const getCurveText = function (plotType, curve) {
   }).textPattern;
   let text = "";
 
-  for (let i = 0; i < curveTextPattern.length; i++) {
+  for (let i = 0; i < curveTextPattern.length; i += 1) {
     const a = curveTextPattern[i];
-    if (a === undefined || a === null || curve[a[1]] === undefined) {
-      continue;
-    }
-    text += a[0];
-    if (curve[a[1]] instanceof Array && curve[a[1]].length > 2) {
-      text += `${curve[a[1]][0]}..${curve[a[1]][curve[a[1]].length - 1]}`;
-    } else {
-      text += curve[a[1]];
+    if (a !== undefined && a !== null && curve[a[1]] !== undefined) {
+      text += a[0];
+      if (curve[a[1]] instanceof Array && curve[a[1]].length > 2) {
+        text += `${curve[a[1]][0]}..${curve[a[1]][curve[a[1]].length - 1]}`;
+      } else {
+        text += curve[a[1]];
+      }
+      text += a[2];
     }
-    text += a[2];
   }
   return text;
 };
@@ -60,57 +89,29 @@ const getCurveTextWrapping = function (plotType, curve) {
   }).textPattern;
   let text = "";
   let wrapLimit = 40;
-  for (let i = 0; i < curveTextPattern.length; i++) {
+  for (let i = 0; i < curveTextPattern.length; i += 1) {
     const a = curveTextPattern[i];
-    if (a === undefined || a === null || curve[a[1]] === undefined) {
-      continue;
-    }
-    text += a[0];
-    if (curve[a[1]] instanceof Array && curve[a[1]].length > 2) {
-      text += `${curve[a[1]][0]}..${curve[a[1]][curve[a[1]].length - 1]}`;
-    } else {
-      text += curve[a[1]];
-    }
-    text += a[2];
-    if (text.length > wrapLimit) {
-      text += "<br>";
-      wrapLimit += 40;
+    if (a !== undefined && a !== null && curve[a[1]] !== undefined) {
+      text += a[0];
+      if (curve[a[1]] instanceof Array && curve[a[1]].length > 2) {
+        text += `${curve[a[1]][0]}..${curve[a[1]][curve[a[1]].length - 1]}`;
+      } else {
+        text += curve[a[1]];
+      }
+      text += a[2];
+      if (text.length > wrapLimit) {
+        text += "<br>";
+        wrapLimit += 40;
+      }
     }
   }
   return text;
 };
 
-// determine which plotType radio button is checked
-const getPlotType = function () {
-  return document.getElementById("plotTypes-selector")
-    ? document.getElementById("plotTypes-selector").value
-    : undefined;
-};
-
-// determine which plotFormat radio button is checked
-const getPlotFormat = function () {
-  const buttons = document.getElementsByName("plotFormat");
-  if (buttons === undefined) {
-    return ""; // app may not have plotFormat?
-  }
-  const plotFormatParam = matsCollections.PlotParams.findOne({ name: "plotFormat" });
-  if (plotFormatParam === undefined) {
-    return ""; // app may not have plotFormat?
-  }
-  const { optionsMap } = plotFormatParam;
-  for (let i = 0, len = buttons.length; i < len; i++) {
-    if (buttons[i].checked) {
-      return buttons[i].value;
-    }
-  }
-  return ""; // error condition actually - shouldn't ever happen
-};
-
 // Determine which BestFit radio button is checked
 const getBestFit = function () {
   const buttons = document.getElementsByName("Fit Type");
-  const { optionsMap } = matsCollections.PlotParams.findOne({ name: "bestFit" });
-  for (let i = 0, len = buttons.length; i < len; i++) {
+  for (let i = 0, len = buttons.length; i < len; i += 1) {
     if (buttons[i].checked) {
       return buttons[i].value;
     }
@@ -121,7 +122,7 @@ const getBestFit = function () {
 const containsPoint = function (pointArray, point) {
   const lat = point[0];
   const lon = point[1];
-  for (let i = 0; i < pointArray.length; i++) {
+  for (let i = 0; i < pointArray.length; i += 1) {
     const pLat = pointArray[i][0];
     const pLon = pointArray[i][1];
     if (lat === pLat && lon === pLon) {
@@ -167,7 +168,7 @@ const restoreSettings = function (p) {
   // get the plot-type elements checked state
   let plotTypeSaved = false;
   const plotTypeElems = document.getElementById("plotTypes-selector");
-  for (let ptei = 0; ptei < plotTypeElems.length; ptei++) {
+  for (let ptei = 0; ptei < plotTypeElems.length; ptei += 1) {
     const ptElem = plotTypeElems[ptei];
     if (p.data.plotTypes && p.data.plotTypes[ptElem.value] === true) {
       plotTypeSaved = true;
@@ -260,7 +261,7 @@ const restoreSettings = function (p) {
   const superiors = [];
   const dependents = [];
   // get all of the curve param collections in one place
-  for (let pidx = 0; pidx < paramNames.length; pidx++) {
+  for (let pidx = 0; pidx < paramNames.length; pidx += 1) {
     const param = matsCollections[paramNames[pidx]].find({}).fetch()[0];
     // superiors
     if (param.dependentNames !== undefined) {
@@ -369,6 +370,7 @@ const restoreSettings = function (p) {
   matsParamUtils.collapseParams();
 };
 
+// eslint-disable-next-line no-undef
 export default matsPlotUtils = {
   getAxisText,
   getCurveText,
diff --git a/meteor_packages/mats-common/lib/regression.js b/meteor_packages/mats-common/lib/regression.js
index 68d040282..f7b0a9ed5 100644
--- a/meteor_packages/mats-common/lib/regression.js
+++ b/meteor_packages/mats-common/lib/regression.js
@@ -2,33 +2,34 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 const gaussianElimination = function (a, o) {
+  const thisA = a;
   let i = 0;
   let j = 0;
   let k = 0;
   let maxrow = 0;
   let tmp = 0;
-  const n = a.length - 1;
+  const n = thisA.length - 1;
   const x = new Array(o);
-  for (i = 0; i < n; i++) {
+  for (i = 0; i < n; i += 1) {
     maxrow = i;
-    for (j = i + 1; j < n; j++) {
-      if (Math.abs(a[i][j]) > Math.abs(a[i][maxrow])) maxrow = j;
+    for (j = i + 1; j < n; j += 1) {
+      if (Math.abs(thisA[i][j]) > Math.abs(thisA[i][maxrow])) maxrow = j;
     }
-    for (k = i; k < n + 1; k++) {
-      tmp = a[k][i];
-      a[k][i] = a[k][maxrow];
-      a[k][maxrow] = tmp;
+    for (k = i; k < n + 1; k += 1) {
+      tmp = thisA[k][i];
+      thisA[k][i] = thisA[k][maxrow];
+      thisA[k][maxrow] = tmp;
     }
-    for (j = i + 1; j < n; j++) {
-      for (k = n; k >= i; k--) {
-        a[k][j] -= (a[k][i] * a[i][j]) / a[i][i];
+    for (j = i + 1; j < n; j += 1) {
+      for (k = n; k >= i; k -= 1) {
+        thisA[k][j] -= (thisA[k][i] * thisA[i][j]) / thisA[i][i];
       }
     }
   }
-  for (j = n - 1; j >= 0; j--) {
+  for (j = n - 1; j >= 0; j -= 1) {
     tmp = 0;
-    for (k = j + 1; k < n; k++) tmp += a[k][j] * x[k];
-    x[j] = (a[n][j] - tmp) / a[j][j];
+    for (k = j + 1; k < n; k += 1) tmp += thisA[k][j] * x[k];
+    x[j] = (thisA[n][j] - tmp) / thisA[j][j];
   }
   return x;
 };
@@ -39,7 +40,7 @@ const methods = {
     let n = 0;
     const results = [];
 
-    for (; n < data.length; n++) {
+    for (; n < data.length; n += 1) {
       if (data[n][1]) {
         sum[0] += data[n][0];
         sum[1] += data[n][1];
@@ -53,7 +54,7 @@ const methods = {
     const intercept = sum[1] / n - (gradient * sum[0]) / n;
     //  var correlation = (n * sum[3] - sum[0] * sum[1]) / Math.sqrt((n * sum[2] - sum[0] * sum[0]) * (n * sum[4] - sum[1] * sum[1]));
 
-    for (let i = 0, len = data.length; i < len; i++) {
+    for (let i = 0, len = data.length; i < len; i += 1) {
       const coordinate = [data[i][0], data[i][0] * gradient + intercept];
       results.push(coordinate);
     }
@@ -70,7 +71,7 @@ const methods = {
     let n = 0;
     const results = [];
 
-    for (; n < data.length; n++) {
+    for (; n < data.length; n += 1) {
       if (data[n][1]) {
         sum[0] += data[n][0] * data[n][0]; // sumSqX
         sum[1] += data[n][0] * data[n][1]; // sumXY
@@ -79,7 +80,7 @@ const methods = {
 
     const gradient = sum[1] / sum[0];
 
-    for (let i = 0, len = data.length; i < len; i++) {
+    for (let i = 0, len = data.length; i < len; i += 1) {
       const coordinate = [data[i][0], data[i][0] * gradient];
       results.push(coordinate);
     }
@@ -94,7 +95,7 @@ const methods = {
     let n = 0;
     const results = [];
 
-    for (len = data.length; n < len; n++) {
+    for (let len = data.length; n < len; n += 1) {
       if (data[n][1]) {
         sum[0] += data[n][0];
         sum[1] += data[n][1];
@@ -109,7 +110,7 @@ const methods = {
     const A = Math.E ** ((sum[2] * sum[3] - sum[5] * sum[4]) / denominator);
     const B = (sum[1] * sum[4] - sum[5] * sum[3]) / denominator;
 
-    for (var i = 0, len = data.length; i < len; i++) {
+    for (let i = 0, len = data.length; i < len; i += 1) {
       const coordinate = [data[i][0], A * Math.E ** (B * data[i][0])];
       results.push(coordinate);
     }
@@ -124,7 +125,7 @@ const methods = {
     let n = 0;
     const results = [];
 
-    for (len = data.length; n < len; n++) {
+    for (let len = data.length; n < len; n += 1) {
       if (data[n][1]) {
         sum[0] += Math.log(data[n][0]);
         sum[1] += data[n][1] * Math.log(data[n][0]);
@@ -136,7 +137,7 @@ const methods = {
     const B = (n * sum[1] - sum[2] * sum[0]) / (n * sum[3] - sum[0] * sum[0]);
     const A = (sum[2] - B * sum[0]) / n;
 
-    for (var i = 0, len = data.length; i < len; i++) {
+    for (let i = 0, len = data.length; i < len; i += 1) {
       const coordinate = [data[i][0], A + B * Math.log(data[i][0])];
       results.push(coordinate);
     }
@@ -153,7 +154,7 @@ const methods = {
     let n = 0;
     const results = [];
 
-    for (len = data.length; n < len; n++) {
+    for (let len = data.length; n < len; n += 1) {
       if (data[n][1]) {
         sum[0] += Math.log(data[n][0]);
         sum[1] += Math.log(data[n][1]) * Math.log(data[n][0]);
@@ -165,7 +166,7 @@ const methods = {
     const B = (n * sum[1] - sum[2] * sum[0]) / (n * sum[3] - sum[0] * sum[0]);
     const A = Math.E ** ((sum[2] - B * sum[0]) / n);
 
-    for (var i = 0, len = data.length; i < len; i++) {
+    for (let i = 0, len = data.length; i < len; i += 1) {
       const coordinate = [data[i][0], A * data[i][0] ** B];
       results.push(coordinate);
     }
@@ -176,32 +177,34 @@ const methods = {
   },
 
   polynomial(data, order) {
-    if (typeof order === "undefined") {
-      order = 2;
+    let thisOrder = order;
+    if (typeof thisOrder === "undefined") {
+      thisOrder = 2;
     }
     const lhs = [];
     const rhs = [];
     const results = [];
     let a = 0;
     let b = 0;
-    var i = 0;
-    const k = order + 1;
+    const k = thisOrder + 1;
 
-    for (; i < k; i++) {
-      for (var l = 0, len = data.length; l < len; l++) {
+    for (let i = 0; i < k; i += 1) {
+      for (let l = 0, len = data.length; l < len; l += 1) {
         if (data[l][1]) {
           a += data[l][0] ** i * data[l][1];
         }
       }
-      lhs.push(a), (a = 0);
+      lhs.push(a);
+      a = 0;
       const c = [];
-      for (let j = 0; j < k; j++) {
-        for (var l = 0, len = data.length; l < len; l++) {
+      for (let j = 0; j < k; j += 1) {
+        for (let l = 0, len = data.length; l < len; l += 1) {
           if (data[l][1]) {
             b += data[l][0] ** (i + j);
           }
         }
-        c.push(b), (b = 0);
+        c.push(b);
+        b = 0;
       }
       rhs.push(c);
     }
@@ -209,9 +212,9 @@ const methods = {
 
     const equation = gaussianElimination(rhs, k);
 
-    for (var i = 0, len = data.length; i < len; i++) {
+    for (let i = 0, len = data.length; i < len; i += 1) {
       let answer = 0;
-      for (let w = 0; w < equation.length; w++) {
+      for (let w = 0; w < equation.length; w += 1) {
         answer += equation[w] * data[i][0] ** w;
       }
       results.push([data[i][0], answer]);
@@ -219,9 +222,9 @@ const methods = {
 
     let string = "y = ";
 
-    for (var i = equation.length - 1; i >= 0; i--) {
+    for (let i = equation.length - 1; i >= 0; i -= 1) {
       if (i > 1) string += `${Math.round(equation[i] * 10 ** i) / 10 ** i}x^${i} + `;
-      else if (i === 1) string += `${Math.round(equation[i] * 100) / 100}x` + ` + `;
+      else if (i === 1) string += `${Math.round(equation[i] * 100) / 100}x + `;
       else string += Math.round(equation[i] * 100) / 100;
     }
 
@@ -231,9 +234,9 @@ const methods = {
   lastvalue(data) {
     const results = [];
     let lastvalue = null;
-    for (let i = 0; i < data.length; i++) {
+    for (let i = 0; i < data.length; i += 1) {
       if (data[i][1]) {
-        lastvalue = data[i][1];
+        [, lastvalue] = data[i];
         results.push([data[i][0], data[i][1]]);
       } else {
         results.push([data[i][0], lastvalue]);
@@ -244,8 +247,10 @@ const methods = {
   },
 };
 
+// eslint-disable-next-line no-undef
 export default regression = function (method, data, order) {
   if (typeof method === "string") {
     return methods[method](data, order);
   }
+  return null;
 };
diff --git a/meteor_packages/mats-common/package.js b/meteor_packages/mats-common/package.js
index b872f5da8..cae60958c 100644
--- a/meteor_packages/mats-common/package.js
+++ b/meteor_packages/mats-common/package.js
@@ -2,6 +2,8 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 
+/* global Package, Npm */
+
 Package.describe({
   name: "randyp:mats-common",
   version: "5.3.1",
@@ -78,7 +80,6 @@ Package.onUse(function (api) {
   api.export("matsSelectUtils", ["client"]);
   api.export("matsGraphUtils", ["client"]);
   api.export("matsParamUtils", ["client", "server"]);
-  api.export("matsMathUtils", ["client", "server"]);
   api.export("matsPlotUtils", ["client", "server"]);
   api.export("matsDataUtils", ["server"]);
   api.export("matsDataQueryUtils", ["server"]);
@@ -151,7 +152,6 @@ Package.onUse(function (api) {
   api.addFiles("lib/regression.js", ["client", "server"]);
   api.addFiles("lib/param_util.js", ["client", "server"]);
   api.addFiles("lib/plot_util.js", ["client", "server"]);
-  api.addFiles("lib/math_util.js", ["client", "server"]);
 
   // templates
   api.addFiles("templates/Home.html", "client");
@@ -190,8 +190,6 @@ Package.onUse(function (api) {
   api.addFiles("templates/graph/graph.html", "client");
   api.addFiles("templates/graph/graph.js", "client");
 
-  api.addFiles("templates/graph/displayFunctions/graph_plotly.js", "client");
-
   api.addFiles("templates/graphStandAlone/graphStandAlone.html", "client");
   api.addFiles("templates/graphStandAlone/graphStandAlone.js", "client");
 
diff --git a/meteor_packages/mats-common/public/MATSReleaseNotes.html b/meteor_packages/mats-common/public/MATSReleaseNotes.html
index c626ebc11..bce51fa98 100755
--- a/meteor_packages/mats-common/public/MATSReleaseNotes.html
+++ b/meteor_packages/mats-common/public/MATSReleaseNotes.html
@@ -12,6 +12,7 @@ <h4>All apps v5.3.3</h4>
   <p>Changes:</p>
   <p>* Fixed broken CSV export.</p>
   <p>* Surface app now gets realtime/retro model status out of metadata.</p>
+  <p>* The axis merge button no longer does anything if there is only one curve.</p>
 </div>
 <div>
   <hr
diff --git a/meteor_packages/mats-common/server/main.js b/meteor_packages/mats-common/server/main.js
index 149cd08f7..d679a6d7e 100644
--- a/meteor_packages/mats-common/server/main.js
+++ b/meteor_packages/mats-common/server/main.js
@@ -4,8 +4,12 @@
 
 import "../imports/startup/server/index.js";
 import "../imports/startup/both/index.js";
+import { Meteor } from "meteor/meteor";
 import { ServiceConfiguration } from "meteor/service-configuration";
 
+/* global Npm */
+/* eslint-disable no-console */
+
 const setGoogleCred = function () {
   /*
      from developer console:
@@ -27,7 +31,9 @@ const setGoogleCred = function () {
         cSecret = cred.secret;
         _id = cred._id;
       }
-    } catch (ignore) {}
+    } catch (ignore) {
+      console.log("Can't find credentials");
+    }
     switch (hostname.split(".")[0]) {
       case "mats":
         gid =
diff --git a/meteor_packages/mats-common/templates/CustomHome.html b/meteor_packages/mats-common/templates/CustomHome.html
index 1ee7b21c7..a5690f10a 100644
--- a/meteor_packages/mats-common/templates/CustomHome.html
+++ b/meteor_packages/mats-common/templates/CustomHome.html
@@ -18,7 +18,7 @@
         >
       </div>
       <div class="row pull-left col-lg-8" id="plotTypeContainer">{{>plotType}}</div>
-      {{>About}} {{#if Template.subscriptionsReady}} {{#if isUnderConstruction}}
+      {{>about}} {{#if Template.subscriptionsReady}} {{#if isUnderConstruction}}
       <div class="row pull-left col-lg-12">{{>underConstruction}}</div>
       {{else}}
       <div class="row">{{>changePlotType}}</div>
diff --git a/meteor_packages/mats-common/templates/Home.html b/meteor_packages/mats-common/templates/Home.html
index 71ca484f0..2bb8e6e4e 100644
--- a/meteor_packages/mats-common/templates/Home.html
+++ b/meteor_packages/mats-common/templates/Home.html
@@ -18,7 +18,7 @@
         >
       </div>
       <div class="row pull-left col-lg-8" id="plotTypeContainer">{{>plotType}}</div>
-      {{>About}} {{#if Template.subscriptionsReady}} {{#if isUnderConstruction}}
+      {{>about}} {{#if Template.subscriptionsReady}} {{#if isUnderConstruction}}
       <div class="row pull-left col-lg-12">{{>underConstruction}}</div>
       {{else}}
       <div class="row">{{>changePlotType}}</div>
diff --git a/meteor_packages/mats-common/templates/ScorecardHome.html b/meteor_packages/mats-common/templates/ScorecardHome.html
index 20ae4b074..1dc75b130 100644
--- a/meteor_packages/mats-common/templates/ScorecardHome.html
+++ b/meteor_packages/mats-common/templates/ScorecardHome.html
@@ -20,7 +20,7 @@
       <div class="row pull-left col-lg-8" id="plotTypeContainer" hidden>
         {{>plotType}}
       </div>
-      {{>About}} {{#if Template.subscriptionsReady}} {{#if isUnderConstruction}}
+      {{>about}} {{#if Template.subscriptionsReady}} {{#if isUnderConstruction}}
       <div class="row pull-left col-lg-12">{{>underConstruction}}</div>
       {{else}}
       <div class="row">{{>changePlotType}}</div>
diff --git a/meteor_packages/mats-common/templates/about/about.html b/meteor_packages/mats-common/templates/about/about.html
index 389ae11ce..0cbc24879 100644
--- a/meteor_packages/mats-common/templates/about/about.html
+++ b/meteor_packages/mats-common/templates/about/about.html
@@ -1,4 +1,4 @@
-<template name="About">
+<template name="about">
   <div
     class="modal fade"
     id="modal-display-about"
diff --git a/meteor_packages/mats-common/templates/about/about.js b/meteor_packages/mats-common/templates/about/about.js
index c475bf481..72f6d48b5 100644
--- a/meteor_packages/mats-common/templates/about/about.js
+++ b/meteor_packages/mats-common/templates/about/about.js
@@ -3,11 +3,14 @@
  */
 
 import { matsTypes, matsCollections } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
 import matsMethods from "../../imports/startup/api/matsMethods";
 
+/* global Session, setError */
+
 let notes;
 
-Template.About.helpers({
+Template.about.helpers({
   isMetexpress() {
     if (
       matsCollections.Settings.findOne({}) !== undefined &&
@@ -35,7 +38,7 @@ Template.About.helpers({
   },
 });
 
-Template.About.events({
+Template.about.events({
   "click .show-release-notes"() {
     matsMethods.getReleaseNotes.call({}, function (error, result) {
       if (error !== undefined) {
@@ -44,6 +47,7 @@ Template.About.events({
       }
       notes = result;
       Session.set("notesUpdated", Date.now());
+      return null;
     });
     document.getElementById("showNotes").style.display = "none";
     document.getElementById("hideNotes").style.display = "block";
diff --git a/meteor_packages/mats-common/templates/changePlotType/changePlotType.js b/meteor_packages/mats-common/templates/changePlotType/changePlotType.js
index ac7e7657c..529039d08 100644
--- a/meteor_packages/mats-common/templates/changePlotType/changePlotType.js
+++ b/meteor_packages/mats-common/templates/changePlotType/changePlotType.js
@@ -3,6 +3,9 @@
  */
 
 import { matsParamUtils, matsCurveUtils } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
+
+/* global Session, $ */
 
 // moved here from plotType.html and plotType.js
 Template.changePlotType.events({
diff --git a/meteor_packages/mats-common/templates/curves/curve_item.js b/meteor_packages/mats-common/templates/curves/curve_item.js
index f26d928a7..7a650ae48 100644
--- a/meteor_packages/mats-common/templates/curves/curve_item.js
+++ b/meteor_packages/mats-common/templates/curves/curve_item.js
@@ -10,11 +10,15 @@ import {
   matsParamUtils,
   matsSelectUtils,
 } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
+import { moment } from "meteor/momentjs:moment";
+
+/* global Session, jQuery, $, _ */
+/* eslint-disable no-console */
 
-label;
 Template.curveItem.onRendered(function () {
   // the value used for the colorpicker (l) MUST match the returned value in the colorpick helper
-  label = this.data.label;
+  const { label } = this.data;
   $(function () {
     const l = `.${label}-colorpick`;
     $(l).colorpicker({ format: "rgb", align: "left" });
@@ -53,7 +57,7 @@ Template.curveItem.helpers({
       let plotType = Session.get("plotType");
       if (plotType === undefined) {
         const pfuncs = matsCollections.PlotGraphFunctions.find({}).fetch();
-        for (let i = 0; i < pfuncs.length; i++) {
+        for (let i = 0; i < pfuncs.length; i += 1) {
           if (pfuncs[i].checked === true) {
             Session.set("plotType", pfuncs[i].plotType);
           }
@@ -61,7 +65,7 @@ Template.curveItem.helpers({
         plotType = Session.get("plotType");
       }
       if (this.region) {
-        this.regionName = this.region.split(" ")[0];
+        [this.regionName] = this.region.split(" ");
       }
       return matsPlotUtils.getCurveText(plotType, this);
     }
@@ -76,11 +80,12 @@ Template.curveItem.helpers({
   defaultColor() {
     const curves = Session.get("Curves");
     const { label } = this;
-    for (let i = 0; i < curves.length; i++) {
+    for (let i = 0; i < curves.length; i += 1) {
       if (curves[i].label === label) {
         return curves[i].color;
       }
     }
+    return null;
   },
   curveNumber() {
     const { label } = this;
@@ -120,7 +125,7 @@ const setParamsToAxis = function (newAxis, currentParams) {
   const superiors = [];
   const dependents = [];
   // get all of the curve param collections in one place
-  for (let pidx = 0; pidx < paramNames.length; pidx++) {
+  for (let pidx = 0; pidx < paramNames.length; pidx += 1) {
     const param = matsCollections[paramNames[pidx]].find({}).fetch()[0];
     // superiors
     if (param.dependentNames !== undefined) {
@@ -133,25 +138,24 @@ const setParamsToAxis = function (newAxis, currentParams) {
       params.push(param);
     }
   }
-  for (let s = 0; s < superiors.length; s++) {
-    var plotParam = superiors[p];
+  for (let s = 0; s < superiors.length; s += 1) {
+    const plotParam = superiors[s];
     // do any date parameters - there are no axis date params in a scatter plot
     if (plotParam.type === matsTypes.InputTypes.dateRange) {
-      if (currentParams[plotParam.name] === undefined) {
-        continue; // just like continue
+      if (currentParams[plotParam.name] !== undefined) {
+        const dateArr = currentParams[plotParam.name].split(" - ");
+        const from = dateArr[0];
+        const to = dateArr[1];
+        const idref = `#${plotParam.name}-${plotParam.type}`;
+        $(idref)
+          .data("daterangepicker")
+          .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
+        $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
+        matsParamUtils.setValueTextForParamName(
+          plotParam.name,
+          currentParams[plotParam.name]
+        );
       }
-      const dateArr = currentParams[plotParam.name].split(" - ");
-      const from = dateArr[0];
-      const to = dateArr[1];
-      const idref = `#${plotParam.name}-${plotParam.type}`;
-      $(idref)
-        .data("daterangepicker")
-        .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
-      $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
-      matsParamUtils.setValueTextForParamName(
-        plotParam.name,
-        currentParams[plotParam.name]
-      );
     } else {
       currentParamName =
         currentParams[`${newAxis}-${plotParam.name}`] === undefined
@@ -167,29 +171,28 @@ const setParamsToAxis = function (newAxis, currentParams) {
   }
   // now reset the form parameters for the dependents
   const combParams = _.union(params, dependents);
-  for (var p = 0; p < combParams.length; p++) {
-    var plotParam = combParams[p];
+  for (let p = 0; p < combParams.length; p += 1) {
+    const plotParam = combParams[p];
     // do any plot date parameters
     currentParamName =
       currentParams[`${newAxis}-${plotParam.name}`] === undefined
         ? plotParam.name
         : `${newAxis}-${plotParam.name}`;
     if (plotParam.type === matsTypes.InputTypes.dateRange) {
-      if (currentParams[currentParamName] === undefined) {
-        continue; // just like continue
+      if (currentParams[currentParamName] !== undefined) {
+        const dateArr = currentParams[currentParamName].split(" - ");
+        const from = dateArr[0];
+        const to = dateArr[1];
+        const idref = `#${plotParam.name}-${plotParam.type}`;
+        $(idref)
+          .data("daterangepicker")
+          .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
+        $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
+        matsParamUtils.setValueTextForParamName(
+          plotParam.name,
+          currentParams[currentParamName]
+        );
       }
-      const dateArr = currentParams[currentParamName].split(" - ");
-      const from = dateArr[0];
-      const to = dateArr[1];
-      const idref = `#${plotParam.name}-${plotParam.type}`;
-      $(idref)
-        .data("daterangepicker")
-        .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
-      $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
-      matsParamUtils.setValueTextForParamName(
-        plotParam.name,
-        currentParams[currentParamName]
-      );
     } else {
       const val =
         currentParams[currentParamName] === null ||
@@ -201,8 +204,8 @@ const setParamsToAxis = function (newAxis, currentParams) {
   }
   // reset the scatter parameters
   params = matsCollections.Scatter2dParams.find({}).fetch();
-  for (var p = 0; p < params.length; p++) {
-    var plotParam = params[p];
+  for (let p = 0; p < params.length; p += 1) {
+    const plotParam = params[p];
     currentParamName =
       currentParams[`${newAxis}-${plotParam.name}`] === undefined
         ? plotParam.name
@@ -223,25 +226,24 @@ const correlateEditPanelToCurveItems = function (
   currentParams,
   doCheckHideOther
 ) {
-  for (let p = 0; p < params.length; p++) {
+  for (let p = 0; p < params.length; p += 1) {
     const plotParam = params[p];
     // do any plot date parameters
     if (plotParam.type === matsTypes.InputTypes.dateRange) {
-      if (currentParams[plotParam.name] === undefined) {
-        continue; // just like continue
+      if (currentParams[plotParam.name] !== undefined) {
+        const dateArr = currentParams[plotParam.name].split(" - ");
+        const from = dateArr[0];
+        const to = dateArr[1];
+        const idref = `#${plotParam.name}-${plotParam.type}`;
+        $(idref)
+          .data("daterangepicker")
+          .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
+        $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
+        matsParamUtils.setValueTextForParamName(
+          plotParam.name,
+          currentParams[plotParam.name]
+        );
       }
-      const dateArr = currentParams[plotParam.name].split(" - ");
-      const from = dateArr[0];
-      const to = dateArr[1];
-      const idref = `#${plotParam.name}-${plotParam.type}`;
-      $(idref)
-        .data("daterangepicker")
-        .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
-      $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
-      matsParamUtils.setValueTextForParamName(
-        plotParam.name,
-        currentParams[plotParam.name]
-      );
     } else {
       const val =
         currentParams[plotParam.name] === null ||
@@ -250,7 +252,7 @@ const correlateEditPanelToCurveItems = function (
           : currentParams[plotParam.name];
       matsParamUtils.setInputForParamName(plotParam.name, val);
     }
-    if (doCheckHideOther) {
+    if (currentParams[plotParam.name] !== undefined && doCheckHideOther) {
       matsSelectUtils.checkHideOther(plotParam, false);
     }
   }
@@ -268,7 +270,7 @@ Template.curveItem.events({
     document.getElementById("cancel").click();
     Session.set("paramWellColor", "#f5f5f5");
   },
-  "click .remove-curve"(event) {
+  "click .remove-curve"() {
     const removeCurve = Session.get("confirmRemoveCurve");
     if (removeCurve && removeCurve.confirm) {
       const { label } = removeCurve;
@@ -283,12 +285,13 @@ Template.curveItem.events({
       Session.set("confirmRemoveCurve", "");
       Session.set("lastUpdate", Date.now());
       if (Curves.length === 0) {
-        location.reload(true);
+        window.location.reload(true);
       }
       return false;
     }
     Session.set("confirmRemoveCurve", { label: this.label, color: this.color });
     $("#modal-confirm-remove-curve").modal();
+    return null;
   },
   "click .confirm-remove-curve"() {
     const confirmCurve = Session.get("confirmRemoveCurve");
@@ -299,13 +302,13 @@ Template.curveItem.events({
     });
     $("#curve-list-remove").trigger("click");
   },
-  "click .edit-curve-xaxis"(event) {
+  "click .edit-curve-xaxis"() {
     Session.set("axis", "xaxis");
     Session.set("editMode", this.label);
     const currentParams = jQuery.extend({}, this);
     setParamsToAxis("xaxis", currentParams);
   },
-  "click .edit-curve-yaxis"(event) {
+  "click .edit-curve-yaxis"() {
     Session.set("axis", "yaxis");
     Session.set("editMode", this.label);
     const currentParams = jQuery.extend({}, this);
@@ -348,7 +351,7 @@ Template.curveItem.events({
     const superiors = [];
     const hidden = [];
     // get all of the curve param collections in one place
-    for (let pidx = 0; pidx < paramNames.length; pidx++) {
+    for (let pidx = 0; pidx < paramNames.length; pidx += 1) {
       const param = matsCollections[paramNames[pidx]].find({}).fetch()[0];
       // superiors
       if (param.dependentNames !== undefined) {
@@ -363,25 +366,26 @@ Template.curveItem.events({
         params.push(param);
       }
     }
-    for (var p = 0; p < superiors.length; p++) {
-      var plotParam = superiors[p];
+    for (let p = 0; p < superiors.length; p += 1) {
+      const plotParam = superiors[p];
       // do any curve date parameters
       if (plotParam.type === matsTypes.InputTypes.dateRange) {
-        if (currentParams[plotParam.name] === undefined) {
-          continue; // just like continue
+        if (currentParams[plotParam.name] !== undefined) {
+          const dateArr = currentParams[plotParam.name].split(" - ");
+          const from = dateArr[0];
+          const to = dateArr[1];
+          const idref = `#${plotParam.name}-${plotParam.type}`;
+          $(idref)
+            .data("daterangepicker")
+            .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
+          $(idref)
+            .data("daterangepicker")
+            .setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
+          matsParamUtils.setValueTextForParamName(
+            plotParam.name,
+            currentParams[plotParam.name]
+          );
         }
-        const dateArr = currentParams[plotParam.name].split(" - ");
-        const from = dateArr[0];
-        const to = dateArr[1];
-        const idref = `#${plotParam.name}-${plotParam.type}`;
-        $(idref)
-          .data("daterangepicker")
-          .setStartDate(moment.utc(from, "MM-DD-YYYY HH:mm"));
-        $(idref).data("daterangepicker").setEndDate(moment.utc(to, "MM-DD-YYYY HH:mm"));
-        matsParamUtils.setValueTextForParamName(
-          plotParam.name,
-          currentParams[plotParam.name]
-        );
       } else {
         const val =
           currentParams[plotParam.name] === null ||
@@ -401,8 +405,8 @@ Template.curveItem.events({
 
     // reset the scatter parameters
     params = matsCollections.Scatter2dParams.find({}).fetch();
-    for (var p = 0; p < params.length; p++) {
-      var plotParam = params[p];
+    for (let p = 0; p < params.length; p += 1) {
+      const plotParam = params[p];
       const val =
         currentParams[plotParam.name] === null ||
         currentParams[plotParam.name] === undefined
@@ -411,12 +415,11 @@ Template.curveItem.events({
       matsParamUtils.setInputForParamName(plotParam.name, val);
     }
     matsParamUtils.collapseParams();
-    return false;
   },
   hidePicker() {
     const Curves = Session.get("Curves");
     const { label } = this;
-    for (let i = 0; i < Curves.length; i++) {
+    for (let i = 0; i < Curves.length; i += 1) {
       if (label === Curves[i].label) {
         Curves[i].color = document.getElementById(`${label}-color-value`).value;
       }
@@ -464,21 +467,29 @@ Template.curveItem.events({
       $("#confirm-lost-edits").modal();
       return;
     }
-    inputElem && inputElem.focus();
+    if (inputElem) {
+      inputElem.focus();
+    }
     curveListEditNode.click();
-    controlElem && controlElem.click();
+    if (controlElem) {
+      controlElem.click();
+    }
     Session.set("elementChanged", Date.now());
   },
   "click .continue-lose-edits"() {
     const intendedName = Session.get("intendedActiveDisplayButton");
-    const activeDisplayButton = Session.set("activeDisplayButton", intendedName);
+    Session.set("activeDisplayButton", intendedName);
     document.getElementById("cancel").click();
     Session.set("paramWellColor", "#f5f5f5");
     const controlElem = matsParamUtils.getControlElementForParamName(intendedName);
     const inputElem = matsParamUtils.getInputElementForParamName(intendedName);
-    inputElem && inputElem.focus();
+    if (inputElem) {
+      inputElem.focus();
+    }
     curveListEditNode.click();
-    controlElem && controlElem.click();
+    if (controlElem) {
+      controlElem.click();
+    }
     Session.set("elementChanged", Date.now());
   },
   "click .cancel-lose-edits"() {
@@ -486,8 +497,12 @@ Template.curveItem.events({
     const name = Session.get("activeDisplayButton");
     const controlElem = matsParamUtils.getControlElementForParamName(name);
     const inputElem = matsParamUtils.getInputElementForParamName(name);
-    inputElem && inputElem.focus();
-    controlElem && controlElem.click();
+    if (inputElem) {
+      inputElem.focus();
+    }
+    if (controlElem) {
+      controlElem.click();
+    }
     Session.set("elementChanged", Date.now());
   },
 });
diff --git a/meteor_packages/mats-common/templates/curves/curve_list.js b/meteor_packages/mats-common/templates/curves/curve_list.js
index e7618d7c2..abec34cfd 100644
--- a/meteor_packages/mats-common/templates/curves/curve_list.js
+++ b/meteor_packages/mats-common/templates/curves/curve_list.js
@@ -5,11 +5,14 @@
 import {
   matsTypes,
   matsCollections,
-  matsMethods,
   matsCurveUtils,
   matsPlotUtils,
   matsParamUtils,
 } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
+
+/* global Session, $ */
+/* eslint-disable no-console */
 
 Template.curveList.helpers({
   displayPlotUnMatched() {
@@ -100,7 +103,7 @@ Template.curveList.helpers({
     let i;
     let truth;
     let otherTruth;
-    for (i = 0; i < curves.length; i++) {
+    for (i = 0; i < curves.length; i += 1) {
       if (curves[i]["region-type"] === "Predefined region") {
         truth = curves[i].truth;
         break;
@@ -108,7 +111,7 @@ Template.curveList.helpers({
         truth = "METAR";
       }
     }
-    for (i = 0; i < curves.length; i++) {
+    for (i = 0; i < curves.length; i += 1) {
       if (curves[i]["region-type"] === "Predefined region") {
         otherTruth = curves[i].truth;
       } else {
@@ -128,11 +131,7 @@ Template.curveList.helpers({
   },
   matchedLabel() {
     if (Session.get(undefined === "matchName")) {
-      if (setMatchName) {
-        setMatchName();
-      } else {
-        Session.set("matchName", "plot matched");
-      }
+      Session.set("matchName", "plot matched");
     } else {
       Session.set("matchName", "plot matched");
     }
@@ -166,7 +165,6 @@ Template.curveList.events({
       Session.set("paramWellColor", "#f5f5f5"); // default grey
       Session.set("lastUpdate", Date.now());
       Session.set("confirmRemoveAll", "");
-      return false;
     }
     if (Session.get("Curves").length > 0) {
       $("#modal-confirm-remove-all").modal();
@@ -194,7 +192,7 @@ Template.curveList.events({
     document.getElementById("plot-curves").click();
     return false;
   },
-  "click .no-gaps-check"(event) {
+  "click .no-gaps-check"() {
     // make the Interpolate Over Nulls option on the colorbar modal match up with this.
     if (document.getElementById("nullSmooth")) {
       if (document.getElementById("noGapsCheck").checked) {
diff --git a/meteor_packages/mats-common/templates/curves/curve_param_item_group.js b/meteor_packages/mats-common/templates/curves/curve_param_item_group.js
index 2f8939f02..0520f1f20 100644
--- a/meteor_packages/mats-common/templates/curves/curve_param_item_group.js
+++ b/meteor_packages/mats-common/templates/curves/curve_param_item_group.js
@@ -8,6 +8,10 @@ import {
   matsPlotUtils,
   matsParamUtils,
 } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
+
+/* global Session */
+/* eslint-disable no-console */
 
 const allGroups = {};
 Template.curveParamItemGroup.helpers({
@@ -19,9 +23,8 @@ Template.curveParamItemGroup.helpers({
     });
 
     // create a set of groups each with an array of 6 params for display
-    const lastUpdate = Session.get("lastUpdate");
+    Session.get("lastUpdate");
     const plotType = matsPlotUtils.getPlotType();
-    const elmementValues = matsParamUtils.getElementValues().curveParams;
     // derive the sorted pValues, xpValues, and ypValues from the sorted params and the elementValues
     const pValues = [];
     let pattern;
@@ -130,7 +133,7 @@ Template.curveParamItemGroup.helpers({
     }
     const { groupSize } = pattern;
     const { displayParams } = pattern;
-    for (let di = 0; di < displayParams.length; di++) {
+    for (let di = 0; di < displayParams.length; di += 1) {
       pValues.push({
         name: displayParams[di],
         value: c[displayParams[di]],
@@ -155,12 +158,14 @@ Template.curveParamItemGroup.helpers({
         }
         groupParams = [];
       }
-      pValues[pvi] && groupParams.push(pValues[pvi]);
+      if (pValues[pvi]) {
+        groupParams.push(pValues[pvi]);
+      }
       if (groupParams.length >= groupSize) {
         pGroups.push(groupParams);
         groupParams = [];
       }
-      pvi++;
+      pvi += 1;
     }
     // check for a partial last group
     if (groupParams.length > 0) {
@@ -202,12 +207,12 @@ Template.curveParamItemGroup.helpers({
     }
     // Make everything title case
     pLabel = pLabel.split(" ");
-    for (var i = 0; i < pLabel.length; i++) {
+    for (let i = 0; i < pLabel.length; i += 1) {
       pLabel[i] = pLabel[i].charAt(0).toUpperCase() + pLabel[i].slice(1);
       pLabel[i] = pLabel[i] === "Utc" ? "UTC" : pLabel[i];
     }
     pLabel = pLabel.join(" ").split("-");
-    for (var i = 0; i < pLabel.length; i++) {
+    for (let i = 0; i < pLabel.length; i += 1) {
       pLabel[i] = pLabel[i].charAt(0).toUpperCase() + pLabel[i].slice(1);
     }
     return pLabel.join(" ");
@@ -219,14 +224,14 @@ Template.curveParamItemGroup.helpers({
     return elem.name;
   },
   buttonId(elem) {
-    const name = new String(elem.name);
+    const name = elem.name.toString();
     const upperName = name.toUpperCase();
     const curveNumber = elem.index;
     const spanId = `${upperName}-curve-${curveNumber}-Button`;
     return spanId;
   },
   spanId(elem) {
-    const name = new String(elem.name);
+    const name = elem.name.toString();
     const upperName = name.toUpperCase();
     const curveNumber = elem.index;
     const spanId = `${upperName}-curve-${curveNumber}-Item`;
@@ -242,7 +247,7 @@ Template.curveParamItemGroup.helpers({
     let text = "";
     if (Object.prototype.toString.call(value) === "[object Array]") {
       if (value.length === 1) {
-        text = value[0];
+        [text] = value;
       } else if (value.length > 1) {
         text = `${value[0]} .. ${value[value.length - 1]}`;
       }
@@ -255,7 +260,7 @@ Template.curveParamItemGroup.helpers({
     return elem.color;
   },
   border(elem) {
-    const elementChanged = Session.get("elementChanged");
+    Session.get("elementChanged");
     const { name } = elem; // for xaxis params
     const { curve } = elem;
     const adb = name === Session.get("activeDisplayButton");
@@ -273,29 +278,30 @@ Template.curveParamItemGroup.helpers({
     return Session.get("eventTargetCurve");
   },
   displayParam(elem) {
-    if (elem.name === "label") {
+    const thisElem = elem;
+    if (thisElem.name === "label") {
       return "none";
     }
     // it isn't good enough to just check the item control button. Need to evaluate the hideOtherFor functionality with
     // respect to this particular curve item
     // First - determine if my visibility is controlled by another
     const visibilityControllingParam = matsParamUtils.visibilityControllerForParam(
-      elem.name
+      thisElem.name
     );
     // Second - Check the hide/show state based on the parameter hideOtherFor map in the parameter nad the state of this particular curve
     if (visibilityControllingParam !== undefined) {
-      const curve = Session.get("Curves")[elem.index];
-      const hideOtherFor = visibilityControllingParam.hideOtherFor[elem.name];
+      const curve = Session.get("Curves")[thisElem.index];
+      const hideOtherFor = visibilityControllingParam.hideOtherFor[thisElem.name];
       if (
         curve !== undefined &&
         curve[visibilityControllingParam.name] !== undefined &&
         hideOtherFor.indexOf(curve[visibilityControllingParam.name]) !== -1
       ) {
-        elem.purposelyHidden = true;
+        thisElem.purposelyHidden = true;
         return "none";
       }
     }
-    elem.purposelyHidden = false;
+    thisElem.purposelyHidden = false;
     return "block";
   },
 });
diff --git a/meteor_packages/mats-common/templates/curves/scorecard_curve_list.js b/meteor_packages/mats-common/templates/curves/scorecard_curve_list.js
index 2d97588d3..9afb241ed 100644
--- a/meteor_packages/mats-common/templates/curves/scorecard_curve_list.js
+++ b/meteor_packages/mats-common/templates/curves/scorecard_curve_list.js
@@ -4,12 +4,14 @@
 
 import {
   matsTypes,
-  matsCollections,
-  matsMethods,
   matsCurveUtils,
   matsPlotUtils,
   matsParamUtils,
 } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
+
+/* global Session, $ */
+/* eslint-disable no-console */
 
 Template.scorecardCurveList.helpers({
   displayScorecardStatus() {
@@ -73,7 +75,6 @@ Template.scorecardCurveList.events({
       Session.set("paramWellColor", "#f5f5f5"); // default grey
       Session.set("lastUpdate", Date.now());
       Session.set("confirmRemoveAll", "");
-      return false;
     }
     if (Session.get("Curves").length > 0) {
       $("#modal-confirm-remove-all").modal();
diff --git a/meteor_packages/mats-common/templates/error/error.js b/meteor_packages/mats-common/templates/error/error.js
index 4e9ace972..ba0e36458 100644
--- a/meteor_packages/mats-common/templates/error/error.js
+++ b/meteor_packages/mats-common/templates/error/error.js
@@ -3,6 +3,9 @@
  */
 
 import { matsPlotUtils } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
+
+/* global getError, getStack, clearError */
 
 Template.error.helpers({
   errorMessage() {
diff --git a/meteor_packages/mats-common/templates/footer/footer.js b/meteor_packages/mats-common/templates/footer/footer.js
index f8e87bee9..bdaf58d0b 100644
--- a/meteor_packages/mats-common/templates/footer/footer.js
+++ b/meteor_packages/mats-common/templates/footer/footer.js
@@ -3,6 +3,7 @@
  */
 
 import { matsTypes, matsCollections } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
 
 Template.footer.helpers({
   isMetexpress() {
diff --git a/meteor_packages/mats-common/templates/graph/displayFunctions/graph_plotly.js b/meteor_packages/mats-common/templates/graph/displayFunctions/graph_plotly.js
deleted file mode 100644
index 3a4ccb61d..000000000
--- a/meteor_packages/mats-common/templates/graph/displayFunctions/graph_plotly.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
- */
-
-import { moment } from "meteor/momentjs:moment";
-import { matsTypes, matsCurveUtils, matsGraphUtils } from "meteor/randyp:mats-common";
-
-graphPlotly = function (key) {
-  // get plot info
-  const route = Session.get("route");
-
-  // get dataset info and options
-  const resultSet = matsCurveUtils.getGraphResult();
-  if (resultSet === null || resultSet === undefined || resultSet.data === undefined) {
-    return false;
-  }
-
-  // set options
-  const { options } = resultSet;
-  if (route !== undefined && route !== "") {
-    options.selection = [];
-  }
-
-  // initialize show/hide button labels
-  const dataset = resultSet.data;
-  if (Session.get("graphPlotType") !== matsTypes.PlotTypes.map) {
-    matsGraphUtils.setNoDataLabels(dataset);
-  } else {
-    matsGraphUtils.setNoDataLabelsMap(dataset);
-  }
-};
diff --git a/meteor_packages/mats-common/templates/graph/graph.js b/meteor_packages/mats-common/templates/graph/graph.js
index 4261bd7a2..6ec0c2376 100644
--- a/meteor_packages/mats-common/templates/graph/graph.js
+++ b/meteor_packages/mats-common/templates/graph/graph.js
@@ -3,7 +3,6 @@
  */
 
 import { Meteor } from "meteor/meteor";
-import { Hooks } from "meteor/differential:event-hooks";
 import {
   matsCollections,
   matsCurveUtils,
@@ -12,9 +11,12 @@ import {
   matsPlotUtils,
   matsTypes,
 } from "meteor/randyp:mats-common";
+import { Template } from "meteor/templating";
 import { moment } from "meteor/momentjs:moment";
 
-const pageIndex = 0;
+/* global Session, Plotly, $, _, setError */
+/* eslint-disable no-console */
+
 let annotation = "";
 let openWindows = [];
 let xAxes;
@@ -54,33 +56,134 @@ Template.graph.helpers({
   graphFunction() {
     // causes graph display routine to be processed
     Session.get("PlotResultsUpDated");
-    const graphFunction = Session.get("graphFunction");
-    if (graphFunction && !graphFunction.toLowerCase().includes("scorecard")) {
-      eval(graphFunction)(Session.get("plotResultKey"));
-      const plotType = Session.get("graphPlotType");
-      const dataset = matsCurveUtils.getGraphResult().data;
-      const { options } = matsCurveUtils.getGraphResult();
-      Session.set("options", options);
+    matsGraphUtils.graphPlotly();
+    const plotType = Session.get("graphPlotType");
+    const dataset = matsCurveUtils.getGraphResult().data;
+    const { options } = matsCurveUtils.getGraphResult();
+    Session.set("options", options);
 
-      // need to save some curve options so that the reset button can undo Plotly.restyle
-      switch (plotType) {
-        case matsTypes.PlotTypes.contour:
-        case matsTypes.PlotTypes.contourDiff:
-          // saved curve options for contours
-          Session.set("colorbarResetOpts", {
-            name: dataset[0].name,
+    // need to save some curve options so that the reset button can undo Plotly.restyle
+    const lineTypeResetOpts = [];
+    const barTypeResetOpts = [];
+    const mapResetOpts = [];
+    switch (plotType) {
+      case matsTypes.PlotTypes.contour:
+      case matsTypes.PlotTypes.contourDiff:
+        // saved curve options for contours
+        Session.set("colorbarResetOpts", {
+          name: dataset[0].name,
+          showlegend: dataset[0].showlegend,
+          "colorbar.title": dataset[0].colorbar.title,
+          autocontour: dataset[0].autocontour,
+          ncontours: dataset[0].ncontours,
+          "contours.start": dataset[0].contours.start,
+          "contours.end": dataset[0].contours.end,
+          "contours.size": dataset[0].contours.size,
+          reversescale: dataset[0].reversescale,
+          connectgaps: dataset[0].connectgaps,
+          colorscale: JSON.stringify(dataset[0].colorscale),
+        });
+        break;
+      case matsTypes.PlotTypes.timeSeries:
+      case matsTypes.PlotTypes.profile:
+      case matsTypes.PlotTypes.dieoff:
+      case matsTypes.PlotTypes.threshold:
+      case matsTypes.PlotTypes.validtime:
+      case matsTypes.PlotTypes.gridscale:
+      case matsTypes.PlotTypes.dailyModelCycle:
+      case matsTypes.PlotTypes.yearToYear:
+      case matsTypes.PlotTypes.reliability:
+      case matsTypes.PlotTypes.roc:
+      case matsTypes.PlotTypes.performanceDiagram:
+      case matsTypes.PlotTypes.gridscaleProb:
+      case matsTypes.PlotTypes.simpleScatter:
+        // saved curve options for line graphs
+        for (let lidx = 0; lidx < dataset.length; lidx += 1) {
+          lineTypeResetOpts.push({
+            name: dataset[lidx].name,
+            visible: dataset[lidx].visible,
+            showlegend: dataset[lidx].showlegend,
+            mode: dataset[lidx].mode,
+            xaxis: dataset[lidx].xaxis,
+            yaxis: dataset[lidx].yaxis,
+            x: [dataset[lidx].x],
+            y: [dataset[lidx].y],
+            text: [dataset[lidx].text],
+            error_y: dataset[lidx].error_y,
+            error_x: dataset[lidx].error_x,
+            "marker.symbol": dataset[lidx].marker.symbol,
+            "marker.size": dataset[lidx].marker.size,
+            "marker.color": dataset[lidx].marker.color,
+          });
+          if (dataset[lidx].binVals !== undefined) {
+            lineTypeResetOpts[lidx].binVals = [dataset[lidx].binVals];
+          } else if (dataset[lidx].threshold_all !== undefined) {
+            lineTypeResetOpts[lidx].threshold_all = [dataset[lidx].threshold_all];
+          }
+          if (plotType !== matsTypes.PlotTypes.simpleScatter) {
+            lineTypeResetOpts[lidx]["line.dash"] = dataset[lidx].line.dash;
+            lineTypeResetOpts[lidx]["line.width"] = dataset[lidx].line.width;
+            lineTypeResetOpts[lidx]["line.color"] = dataset[lidx].line.color;
+          }
+        }
+        Session.set("lineTypeResetOpts", lineTypeResetOpts);
+        break;
+      case matsTypes.PlotTypes.histogram:
+      case matsTypes.PlotTypes.ensembleHistogram:
+        // saved curve options for histograms
+        for (let bidx = 0; bidx < dataset.length; bidx += 1) {
+          barTypeResetOpts.push({
+            name: dataset[bidx].name,
+            visible: dataset[bidx].visible,
             showlegend: dataset[0].showlegend,
-            "colorbar.title": dataset[0].colorbar.title,
-            autocontour: dataset[0].autocontour,
-            ncontours: dataset[0].ncontours,
-            "contours.start": dataset[0].contours.start,
-            "contours.end": dataset[0].contours.end,
-            "contours.size": dataset[0].contours.size,
-            reversescale: dataset[0].reversescale,
-            connectgaps: dataset[0].connectgaps,
-            colorscale: JSON.stringify(dataset[0].colorscale),
+            "marker.color": dataset[bidx].marker.color,
           });
-          break;
+        }
+        Session.set("barTypeResetOpts", barTypeResetOpts);
+        break;
+      case matsTypes.PlotTypes.map:
+        // saved curve options for maps
+        mapResetOpts[0] = {
+          "marker.opacity": dataset[0].marker.opacity,
+        };
+        for (let midx = 1; midx < dataset.length; midx += 1) {
+          mapResetOpts.push({
+            name: dataset[midx].name,
+            visible: dataset[midx].visible,
+          });
+        }
+        Session.set("mapResetOpts", mapResetOpts);
+        break;
+      case matsTypes.PlotTypes.scatter2d:
+      default:
+        break;
+    }
+    curveOpsUpdate = [];
+    Session.set("thresholdEquiX", false);
+
+    // initial plot
+    $("#placeholder").empty();
+    if (!dataset || !options) {
+      return false;
+    }
+    Plotly.newPlot($("#placeholder")[0], dataset, options, { showLink: true });
+    matsGraphUtils.setGraphView(plotType);
+
+    // there seems to be a bug in the plotly API, where if you have a handler for plotly_legendclick,
+    // it will always supersede the handler for plotly_legenddoubleclick. If you comment out the
+    // handler for plotly_legendclick, then the one for plotly_legenddoubleclick will fire. This
+    // is not the behavior that the plotly instruction manual implies should occur, but seems to
+    // be the reality (the broader plotly_click and plotly_doubleclick work as expected, accurately
+    // recognizing double clicks even if a single click handler exists). I'm going to add handlers
+    // for both plotly_legendclick and plotly_legenddoubleclick anyway, in the hopes that they
+    // eventually fix this and it gets pushed to https://cdn.plot.ly/plotly-latest.min.js, but
+    // until then, the double click show/hide all curves functionality will not exist.
+    $("#placeholder")[0].on("plotly_legendclick", function (data) {
+      const resultDataset = matsCurveUtils.getGraphResult().data;
+      const curveToShowHide = data.curveNumber;
+      const { label } = resultDataset[curveToShowHide];
+      const thisPlotType = Session.get("graphPlotType");
+      switch (thisPlotType) {
         case matsTypes.PlotTypes.timeSeries:
         case matsTypes.PlotTypes.profile:
         case matsTypes.PlotTypes.dieoff:
@@ -93,97 +196,37 @@ Template.graph.helpers({
         case matsTypes.PlotTypes.roc:
         case matsTypes.PlotTypes.performanceDiagram:
         case matsTypes.PlotTypes.gridscaleProb:
+          document.getElementById(`${label}-curve-show-hide`).click();
+          return false;
         case matsTypes.PlotTypes.simpleScatter:
-          // saved curve options for line graphs
-          var lineTypeResetOpts = [];
-          for (let lidx = 0; lidx < dataset.length; lidx += 1) {
-            lineTypeResetOpts.push({
-              name: dataset[lidx].name,
-              visible: dataset[lidx].visible,
-              showlegend: dataset[lidx].showlegend,
-              mode: dataset[lidx].mode,
-              xaxis: dataset[lidx].xaxis,
-              yaxis: dataset[lidx].yaxis,
-              x: [dataset[lidx].x],
-              y: [dataset[lidx].y],
-              text: [dataset[lidx].text],
-              error_y: dataset[lidx].error_y,
-              error_x: dataset[lidx].error_x,
-              "marker.symbol": dataset[lidx].marker.symbol,
-              "marker.size": dataset[lidx].marker.size,
-              "marker.color": dataset[lidx].marker.color,
-            });
-            if (dataset[lidx].binVals !== undefined) {
-              lineTypeResetOpts[lidx].binVals = [dataset[lidx].binVals];
-            } else if (dataset[lidx].threshold_all !== undefined) {
-              lineTypeResetOpts[lidx].threshold_all = [dataset[lidx].threshold_all];
-            }
-            if (plotType !== matsTypes.PlotTypes.simpleScatter) {
-              lineTypeResetOpts[lidx]["line.dash"] = dataset[lidx].line.dash;
-              lineTypeResetOpts[lidx]["line.width"] = dataset[lidx].line.width;
-              lineTypeResetOpts[lidx]["line.color"] = dataset[lidx].line.color;
-            }
-          }
-          Session.set("lineTypeResetOpts", lineTypeResetOpts);
-          break;
+        case matsTypes.PlotTypes.scatter2d:
+          document.getElementById(`${label}-curve-show-hide-points`).click();
+          return false;
         case matsTypes.PlotTypes.histogram:
         case matsTypes.PlotTypes.ensembleHistogram:
-          // saved curve options for histograms
-          var barTypeResetOpts = [];
-          for (let bidx = 0; bidx < dataset.length; bidx += 1) {
-            barTypeResetOpts.push({
-              name: dataset[bidx].name,
-              visible: dataset[bidx].visible,
-              showlegend: dataset[0].showlegend,
-              "marker.color": dataset[bidx].marker.color,
-            });
-          }
-          Session.set("barTypeResetOpts", barTypeResetOpts);
-          break;
+          document.getElementById(`${label}-curve-show-hide-bars`).click();
+          return false;
         case matsTypes.PlotTypes.map:
-          // saved curve options for maps
-          var mapResetOpts = [];
-          mapResetOpts[0] = {
-            "marker.opacity": dataset[0].marker.opacity,
-          };
-          for (let midx = 1; midx < dataset.length; midx += 1) {
-            mapResetOpts.push({
-              name: dataset[midx].name,
-              visible: dataset[midx].visible,
-            });
-          }
-          Session.set("mapResetOpts", mapResetOpts);
-          break;
-        case matsTypes.PlotTypes.scatter2d:
+        case matsTypes.PlotTypes.contour:
+        case matsTypes.PlotTypes.contourDiff:
         default:
-          break;
-      }
-      curveOpsUpdate = [];
-      Session.set("thresholdEquiX", false);
-
-      // initial plot
-      $("#placeholder").empty();
-      if (!dataset || !options) {
-        return false;
+          // keep the plotly default event behavior
+          return true;
       }
-      Plotly.newPlot($("#placeholder")[0], dataset, options, { showLink: true });
-      matsGraphUtils.setGraphView(plotType);
-
-      // there seems to be a bug in the plotly API, where if you have a handler for plotly_legendclick,
-      // it will always supersede the handler for plotly_legenddoubleclick. If you comment out the
-      // handler for plotly_legendclick, then the one for plotly_legenddoubleclick will fire. This
-      // is not the behavior that the plotly instruction manual implies should occur, but seems to
-      // be the reality (the broader plotly_click and plotly_doubleclick work as expected, accurately
-      // recognizing double clicks even if a single click handler exists). I'm going to add handlers
-      // for both plotly_legendclick and plotly_legenddoubleclick anyway, in the hopes that they
-      // eventually fix this and it gets pushed to https://cdn.plot.ly/plotly-latest.min.js, but
-      // until then, the double click show/hide all curves functionality will not exist.
-      $("#placeholder")[0].on("plotly_legendclick", function (data) {
-        const dataset = matsCurveUtils.getGraphResult().data;
-        const curveToShowHide = data.curveNumber;
-        const { label } = dataset[curveToShowHide];
-        const plotType = Session.get("graphPlotType");
-        switch (plotType) {
+    });
+    Session.set("singleCurveIsolated", false);
+    $("#placeholder")[0].on("plotly_legenddoubleclick", function (data) {
+      const returnDataset = matsCurveUtils.getGraphResult().data;
+      const curveToShowHide = data.curveNumber;
+      let { label } = returnDataset[curveToShowHide];
+      const thisPlotType = Session.get("graphPlotType");
+      let hideAllOtherCurves;
+      if (returnDataset[curveToShowHide].visible === "legendonly") {
+        // we want to show this hidden curve and hide all others
+        hideAllOtherCurves = true;
+        Session.set("singleCurveIsolated", label);
+        // update this curve
+        switch (thisPlotType) {
           case matsTypes.PlotTypes.timeSeries:
           case matsTypes.PlotTypes.profile:
           case matsTypes.PlotTypes.dieoff:
@@ -197,15 +240,15 @@ Template.graph.helpers({
           case matsTypes.PlotTypes.performanceDiagram:
           case matsTypes.PlotTypes.gridscaleProb:
             document.getElementById(`${label}-curve-show-hide`).click();
-            return false;
+            break;
           case matsTypes.PlotTypes.simpleScatter:
           case matsTypes.PlotTypes.scatter2d:
             document.getElementById(`${label}-curve-show-hide-points`).click();
-            return false;
+            break;
           case matsTypes.PlotTypes.histogram:
           case matsTypes.PlotTypes.ensembleHistogram:
             document.getElementById(`${label}-curve-show-hide-bars`).click();
-            return false;
+            break;
           case matsTypes.PlotTypes.map:
           case matsTypes.PlotTypes.contour:
           case matsTypes.PlotTypes.contourDiff:
@@ -213,77 +256,36 @@ Template.graph.helpers({
             // keep the plotly default event behavior
             return true;
         }
-      });
-      Session.set("singleCurveIsolated", false);
-      $("#placeholder")[0].on("plotly_legenddoubleclick", function (data) {
-        const dataset = matsCurveUtils.getGraphResult().data;
-        const curveToShowHide = data.curveNumber;
-        let { label } = dataset[curveToShowHide];
-        const plotType = Session.get("graphPlotType");
-        let hideAllOtherCurves;
-        if (dataset[curveToShowHide].visible === "legendonly") {
-          // we want to show this hidden curve and hide all others
-          hideAllOtherCurves = true;
-          Session.set("singleCurveIsolated", label);
-          // update this curve
-          switch (plotType) {
-            case matsTypes.PlotTypes.timeSeries:
-            case matsTypes.PlotTypes.profile:
-            case matsTypes.PlotTypes.dieoff:
-            case matsTypes.PlotTypes.threshold:
-            case matsTypes.PlotTypes.validtime:
-            case matsTypes.PlotTypes.gridscale:
-            case matsTypes.PlotTypes.dailyModelCycle:
-            case matsTypes.PlotTypes.yearToYear:
-            case matsTypes.PlotTypes.reliability:
-            case matsTypes.PlotTypes.roc:
-            case matsTypes.PlotTypes.performanceDiagram:
-            case matsTypes.PlotTypes.gridscaleProb:
-              document.getElementById(`${label}-curve-show-hide`).click();
-              break;
-            case matsTypes.PlotTypes.simpleScatter:
-            case matsTypes.PlotTypes.scatter2d:
-              document.getElementById(`${label}-curve-show-hide-points`).click();
-              break;
-            case matsTypes.PlotTypes.histogram:
-            case matsTypes.PlotTypes.ensembleHistogram:
-              document.getElementById(`${label}-curve-show-hide-bars`).click();
-              break;
-            case matsTypes.PlotTypes.map:
-            case matsTypes.PlotTypes.contour:
-            case matsTypes.PlotTypes.contourDiff:
-            default:
-              // keep the plotly default event behavior
-              return true;
-          }
-        } else if (Session.get("singleCurveIsolated") === label) {
-          // we previously showed this curve and hid the others, so undo that now.
-          hideAllOtherCurves = false;
-          Session.set("singleCurveIsolated", false);
-        } else {
-          // we have a new curve to show at the expense of others, but it's already visible
-          hideAllOtherCurves = true;
-          Session.set("singleCurveIsolated", label);
-        }
-        // update the other curves
-        for (let i = 0; i < dataset.length; i += 1) {
-          if (
-            Object.values(matsTypes.ReservedWords).indexOf(dataset[i].label) >= 0 ||
-            dataset[i].label.includes(matsTypes.ReservedWords.noSkill) ||
-            (plotType === matsTypes.PlotTypes.map &&
-              Object.values(matsTypes.ReservedWords).indexOf(dataset[i].reserved) >=
-                0) ||
+      } else if (Session.get("singleCurveIsolated") === label) {
+        // we previously showed this curve and hid the others, so undo that now.
+        hideAllOtherCurves = false;
+        Session.set("singleCurveIsolated", false);
+      } else {
+        // we have a new curve to show at the expense of others, but it's already visible
+        hideAllOtherCurves = true;
+        Session.set("singleCurveIsolated", label);
+      }
+      // update the other curves
+      for (let i = 0; i < returnDataset.length; i += 1) {
+        if (
+          !(
+            Object.values(matsTypes.ReservedWords).indexOf(returnDataset[i].label) >=
+              0 ||
+            returnDataset[i].label.includes(matsTypes.ReservedWords.noSkill) ||
+            (thisPlotType === matsTypes.PlotTypes.map &&
+              Object.values(matsTypes.ReservedWords).indexOf(
+                returnDataset[i].reserved
+              ) >= 0) ||
             i === curveToShowHide
-          ) {
-            continue; // don't process the zero or max curves
-          }
-          label = dataset[i].label;
-          switch (plotType) {
+          )
+        ) {
+          label = returnDataset[i].label;
+          switch (thisPlotType) {
             case matsTypes.PlotTypes.simpleScatter:
             case matsTypes.PlotTypes.scatter2d:
               if (
-                (hideAllOtherCurves && dataset[i].visible !== "legendonly") ||
-                (!hideAllOtherCurves && dataset[i].visible === "legendonly")
+                (hideAllOtherCurves && returnDataset[i].visible !== "legendonly") ||
+                (!hideAllOtherCurves && returnDataset[i].visible === "legendonly")
               ) {
                 document.getElementById(`${label}-curve-show-hide-points`).click();
               }
@@ -291,8 +293,8 @@ Template.graph.helpers({
             case matsTypes.PlotTypes.histogram:
             case matsTypes.PlotTypes.ensembleHistogram:
               if (
-                (hideAllOtherCurves && dataset[i].visible !== "legendonly") ||
-                (!hideAllOtherCurves && dataset[i].visible === "legendonly")
+                (hideAllOtherCurves && returnDataset[i].visible !== "legendonly") ||
+                (!hideAllOtherCurves && returnDataset[i].visible === "legendonly")
               ) {
                 document.getElementById(`${label}-curve-show-hide-bars`).click();
               }
@@ -311,28 +313,29 @@ Template.graph.helpers({
             case matsTypes.PlotTypes.gridscaleProb:
             default:
               if (
-                (hideAllOtherCurves && dataset[i].visible !== "legendonly") ||
-                (!hideAllOtherCurves && dataset[i].visible === "legendonly")
+                (hideAllOtherCurves && returnDataset[i].visible !== "legendonly") ||
+                (!hideAllOtherCurves && returnDataset[i].visible === "legendonly")
               ) {
                 document.getElementById(`${label}-curve-show-hide`).click();
               }
               break;
           }
         }
-        return false;
-      });
+      }
+      return false;
+    });
 
-      // append annotations and other setup
-      let localAnnotation;
-      for (let i = 0; i < dataset.length; i += 1) {
-        if (
+    // append annotations and other setup
+    let localAnnotation;
+    for (let i = 0; i < dataset.length; i += 1) {
+      if (
+        !(
           Object.values(matsTypes.ReservedWords).indexOf(dataset[i].label) >= 0 ||
           dataset[i].label.includes(matsTypes.ReservedWords.noSkill) ||
           (plotType === matsTypes.PlotTypes.map &&
             Object.values(matsTypes.ReservedWords).indexOf(dataset[i].reserved) >= 0)
-        ) {
-          continue; // don't process the zero or max curves
-        }
+        )
+      ) {
         switch (plotType) {
           case matsTypes.PlotTypes.timeSeries:
           case matsTypes.PlotTypes.profile:
@@ -370,16 +373,12 @@ Template.graph.helpers({
         }
 
         // store the existing axes. Reset global arrays from previous plots.
-        xAxes = [];
-        yAxes = [];
         Session.set("axesCollapsed", false);
-        Object.keys($("#placeholder")[0].layout).filter(function (k) {
-          if (k.startsWith("xaxis")) {
-            xAxes.push(k);
-          }
-          if (k.startsWith("yaxis")) {
-            yAxes.push(k);
-          }
+        xAxes = Object.keys($("#placeholder")[0].layout).filter(function (k) {
+          return k.startsWith("xaxis");
+        });
+        yAxes = Object.keys($("#placeholder")[0].layout).filter(function (k) {
+          return k.startsWith("yaxis");
         });
 
         // enable colorpickers on curve styles modal
@@ -388,40 +387,40 @@ Template.graph.helpers({
           $(`#${l}`).colorpicker({ format: "rgb", align: "left" });
         }
       }
+    }
 
+    if (
+      plotType === matsTypes.PlotTypes.contour ||
+      plotType === matsTypes.PlotTypes.contourDiff
+    ) {
+      // enable colorpicker on colorbar modal, if applicable. Otherwise hide the selection field.
+      const lastCurveIndex = dataset.length - 1;
       if (
-        plotType === matsTypes.PlotTypes.contour ||
-        plotType === matsTypes.PlotTypes.contourDiff
+        dataset[lastCurveIndex].label === matsTypes.ReservedWords.contourSigLabel &&
+        dataset[lastCurveIndex].x.length > 0
       ) {
-        // enable colorpicker on colorbar modal, if applicable. Otherwise hide the selection field.
-        const lastCurveIndex = dataset.length - 1;
-        if (
-          dataset[lastCurveIndex].label === matsTypes.ReservedWords.contourSigLabel &&
-          dataset[lastCurveIndex].x.length > 0
-        ) {
-          $("#sigDotColor").colorpicker({ format: "rgb", align: "left" });
-          $("#sigDotContainer")[0].style.display = "block";
-        } else {
-          $("#sigDotContainer")[0].style.display = "none";
-        }
-
-        // make default colorbar selection actually match what is on the graph
-        const colorscale = JSON.stringify(dataset[0].colorscale);
-        const elem = document.getElementById("colormapSelect");
-        elem.value = colorscale;
+        $("#sigDotColor").colorpicker({ format: "rgb", align: "left" });
+        $("#sigDotContainer")[0].style.display = "block";
+      } else {
+        $("#sigDotContainer")[0].style.display = "none";
       }
 
-      // enable colorpickers on axes modal, if applicable.
-      if (plotType !== matsTypes.PlotTypes.map) {
-        $("#gridColor").colorpicker({ format: "rgb", align: "left" });
-        $("#legendFontColor").colorpicker({ format: "rgb", align: "left" });
-      }
+      // make default colorbar selection actually match what is on the graph
+      const colorscale = JSON.stringify(dataset[0].colorscale);
+      const elem = document.getElementById("colormapSelect");
+      elem.value = colorscale;
+    }
 
-      // store annotation
-      annotation = $("#curves")[0].innerHTML;
-      matsCurveUtils.hideSpinner();
+    // enable colorpickers on axes modal, if applicable.
+    if (plotType !== matsTypes.PlotTypes.map) {
+      $("#gridColor").colorpicker({ format: "rgb", align: "left" });
+      $("#legendFontColor").colorpicker({ format: "rgb", align: "left" });
     }
-    return graphFunction;
+
+    // store annotation
+    annotation = $("#curves")[0].innerHTML;
+    matsCurveUtils.hideSpinner();
+    return null;
   },
   Title() {
     if (
@@ -441,7 +440,7 @@ Template.graph.helpers({
   curves() {
     return Session.get("Curves");
   },
-  indValLabel(curveLabel) {
+  indValLabel() {
     const plotType = Session.get("plotType");
     if (plotType !== undefined) {
       let fieldName;
@@ -483,7 +482,7 @@ Template.graph.helpers({
       if (dataset !== undefined && dataset !== null) {
         for (let i = 0; i < dataset.length; i += 1) {
           if (dataset[i].label === curveLabel) {
-            var indValsArray;
+            let indValsArray;
             switch (plotType) {
               // line plots only
               case matsTypes.PlotTypes.profile:
@@ -536,7 +535,7 @@ Template.graph.helpers({
     return [];
   },
   plotName() {
-    return Session.get("PlotParams") === [] ||
+    return Session.get("PlotParams").length === 0 ||
       Session.get("PlotParams").plotAction === undefined ||
       Session.get("plotType") === matsTypes.PlotTypes.map
       ? ""
@@ -670,23 +669,19 @@ Template.graph.helpers({
     // create an array like [0,1,2...] for each unique xaxis
     // by getting the xaxis keys - filtering them to be unique, then using an Array.apply on the resulting array
     // to assign a number to each value
-    const xaxis = {};
     if (
-      $("#placeholder")[0] === undefined ||
-      $("#placeholder")[0].layout === undefined ||
-      plotType === matsTypes.PlotTypes.map
+      !(
+        $("#placeholder")[0] === undefined ||
+        $("#placeholder")[0].layout === undefined ||
+        plotType === matsTypes.PlotTypes.map
+      )
     ) {
-      return;
+      const xAxis = Object.keys($("#placeholder")[0].layout).filter(function (k) {
+        return k.startsWith("xaxis");
+      });
+      return [...Array(xAxis.length).keys()];
     }
-    Object.keys($("#placeholder")[0].layout).filter(function (k) {
-      if (k.startsWith("xaxis")) {
-        xaxis[k] = $("#placeholder")[0].layout[k];
-      }
-    });
-    return Array.apply(null, { length: Object.keys(xaxis).length }).map(
-      Number.call,
-      Number
-    );
+    return undefined;
   },
   yAxes() {
     Session.get("PlotResultsUpDated");
@@ -694,23 +689,19 @@ Template.graph.helpers({
     // create an array like [0,1,2...] for each unique yaxis
     // by getting the yaxis keys - filtering them to be unique, then using an Array.apply on the resulting array
     // to assign a number to each value
-    const yaxis = {};
     if (
-      $("#placeholder")[0] === undefined ||
-      $("#placeholder")[0].layout === undefined ||
-      plotType === matsTypes.PlotTypes.map
+      !(
+        $("#placeholder")[0] === undefined ||
+        $("#placeholder")[0].layout === undefined ||
+        plotType === matsTypes.PlotTypes.map
+      )
     ) {
-      return;
+      const yAxis = Object.keys($("#placeholder")[0].layout).filter(function (k) {
+        return k.startsWith("yaxis");
+      });
+      return [...Array(yAxis.length).keys()];
     }
-    Object.keys($("#placeholder")[0].layout).filter(function (k) {
-      if (k.startsWith("yaxis")) {
-        yaxis[k] = $("#placeholder")[0].layout[k];
-      }
-    });
-    return Array.apply(null, { length: Object.keys(yaxis).length }).map(
-      Number.call,
-      Number
-    );
+    return undefined;
   },
   isProfile() {
     return Session.get("plotType") === matsTypes.PlotTypes.profile;
@@ -1156,7 +1147,7 @@ Template.graph.helpers({
   },
   xAxisMin(xAxis) {
     Session.get("PlotResultsUpDated");
-    const plotType = Session.get("plotType");
+    Session.get("plotType");
     const options = Session.get("options");
     const xAxisKey = `xaxis${xAxis === 0 ? "" : xAxis + 1}`;
     if (
@@ -1175,7 +1166,7 @@ Template.graph.helpers({
   },
   xAxisMax(xAxis) {
     Session.get("PlotResultsUpDated");
-    const plotType = Session.get("plotType");
+    Session.get("plotType");
     const options = Session.get("options");
     const xAxisKey = `xaxis${xAxis === 0 ? "" : xAxis + 1}`;
     if (
@@ -1368,7 +1359,7 @@ Template.graph.events({
     return false;
   },
 
-  "click .header"(event) {
+  "click .header"() {
     document.getElementById("graph-control").style.display = "block";
     // document.getElementById('showAdministration').style.display = 'block';
     document.getElementById("navbar").style.display = "block";
@@ -1463,7 +1454,6 @@ Template.graph.events({
   },
   "click .plotButton"() {
     matsGraphUtils.setGraphView(Session.get("plotType"));
-    const graphView = document.getElementById("graphView");
     Session.set("graphViewMode", matsTypes.PlotView.graph);
     matsCurveUtils.hideSpinner();
   },
@@ -1489,6 +1479,7 @@ Template.graph.events({
       return false;
     }
     $("#sendModal").modal("show");
+    return null;
   },
   "click .basis"() {
     window.open(
@@ -1537,121 +1528,129 @@ Template.graph.events({
     const dataset = matsCurveUtils.getGraphResult().data;
     const options = Session.get("options");
     const reservedWords = Object.values(matsTypes.ReservedWords);
+    const nCurves = dataset.filter(function (k) {
+      return (
+        reservedWords.indexOf(k.label) === -1 &&
+        !k.label.includes(matsTypes.ReservedWords.noSkill)
+      );
+    }).length;
     let newAxisLabel;
     let min = Number.MAX_VALUE; // placeholder xmin
     let max = -1 * Number.MAX_VALUE; // placeholder xmax
     let didx;
     let xidx;
     let yidx;
-    if (!Session.get("axesCollapsed")) {
-      // combine all x- or y-axes into the same axis
-      for (didx = 0; didx < dataset.length; didx += 1) {
+    if (nCurves > 1) {
+      if (!Session.get("axesCollapsed")) {
+        // combine all x- or y-axes into the same axis
+        for (didx = 0; didx < dataset.length; didx += 1) {
+          if (
+            reservedWords.indexOf(dataset[didx].label) === -1 &&
+            !dataset[didx].label.includes(matsTypes.ReservedWords.noSkill)
+          ) {
+            if (plotType === matsTypes.PlotTypes.profile) {
+              updates[didx] = {
+                xaxis: "x1",
+              };
+            } else if (plotType === matsTypes.PlotTypes.simpleScatter) {
+              updates[didx] = {
+                xaxis: "x1",
+                yaxis: "y1",
+              };
+            } else {
+              updates[didx] = {
+                yaxis: "y1",
+              };
+            }
+            Plotly.restyle($("#placeholder")[0], updates[didx], didx);
+          }
+        }
         if (
-          reservedWords.indexOf(dataset[didx].label) === -1 &&
-          !dataset[didx].label.includes(matsTypes.ReservedWords.noSkill)
+          plotType === matsTypes.PlotTypes.profile ||
+          plotType === matsTypes.PlotTypes.simpleScatter
         ) {
-          if (plotType === matsTypes.PlotTypes.profile) {
-            updates[didx] = {
-              xaxis: "x1",
-            };
-          } else if (plotType === matsTypes.PlotTypes.simpleScatter) {
-            updates[didx] = {
-              xaxis: "x1",
-              yaxis: "y1",
-            };
-          } else {
-            updates[didx] = {
-              yaxis: "y1",
-            };
+          newAxisLabel = "";
+          for (xidx = 0; xidx < xAxes.length; xidx += 1) {
+            newAxisLabel =
+              newAxisLabel === ""
+                ? options[xAxes[xidx]].title
+                : `${newAxisLabel}/${options[xAxes[xidx]].title}`;
+            min =
+              options[xAxes[xidx]].range[0] < min ? options[xAxes[xidx]].range[0] : min;
+            max =
+              options[xAxes[xidx]].range[1] > max ? options[xAxes[xidx]].range[1] : max;
           }
-          Plotly.restyle($("#placeholder")[0], updates[didx], didx);
+          newOpts["xaxis.title"] = newAxisLabel;
+          newOpts["xaxis.range[0]"] = min - (max - min) * 0.125;
+          newOpts["xaxis.range[1]"] = max + (max - min) * 0.125;
         }
-      }
-      if (
-        plotType === matsTypes.PlotTypes.profile ||
-        plotType === matsTypes.PlotTypes.simpleScatter
-      ) {
-        newAxisLabel = "";
-        for (xidx = 0; xidx < xAxes.length; xidx += 1) {
-          newAxisLabel =
-            newAxisLabel === ""
-              ? options[xAxes[xidx]].title
-              : `${newAxisLabel}/${options[xAxes[xidx]].title}`;
-          min =
-            options[xAxes[xidx]].range[0] < min ? options[xAxes[xidx]].range[0] : min;
-          max =
-            options[xAxes[xidx]].range[1] > max ? options[xAxes[xidx]].range[1] : max;
+        if (plotType !== matsTypes.PlotTypes.profile) {
+          newAxisLabel = "";
+          for (yidx = 0; yidx < yAxes.length; yidx += 1) {
+            newAxisLabel =
+              newAxisLabel === ""
+                ? options[yAxes[yidx]].title
+                : `${newAxisLabel}/${options[yAxes[yidx]].title}`;
+            min =
+              options[yAxes[yidx]].range[0] < min ? options[yAxes[yidx]].range[0] : min;
+            max =
+              options[yAxes[yidx]].range[1] > max ? options[yAxes[yidx]].range[1] : max;
+          }
+          newOpts["yaxis.title"] = newAxisLabel;
+          newOpts["yaxis.range[0]"] = min - (max - min) * 0.125;
+          newOpts["yaxis.range[1]"] = max + (max - min) * 0.125;
         }
-        newOpts["xaxis.title"] = newAxisLabel;
-        newOpts["xaxis.range[0]"] = min - (max - min) * 0.125;
-        newOpts["xaxis.range[1]"] = max + (max - min) * 0.125;
-      }
-      if (plotType !== matsTypes.PlotTypes.profile) {
-        newAxisLabel = "";
-        for (yidx = 0; yidx < yAxes.length; yidx += 1) {
-          newAxisLabel =
-            newAxisLabel === ""
-              ? options[yAxes[yidx]].title
-              : `${newAxisLabel}/${options[yAxes[yidx]].title}`;
-          min =
-            options[yAxes[yidx]].range[0] < min ? options[yAxes[yidx]].range[0] : min;
-          max =
-            options[yAxes[yidx]].range[1] > max ? options[yAxes[yidx]].range[1] : max;
+        Plotly.relayout($("#placeholder")[0], newOpts);
+        Session.set("axesCollapsed", true);
+      } else {
+        // separate x- or y-axes back out
+        const lineTypeResetOpts = Session.get("lineTypeResetOpts");
+        for (didx = 0; didx < dataset.length; didx += 1) {
+          if (
+            reservedWords.indexOf(dataset[didx].label) === -1 &&
+            !dataset[didx].label.includes(matsTypes.ReservedWords.noSkill)
+          ) {
+            if (plotType === matsTypes.PlotTypes.profile) {
+              updates[didx] = {
+                xaxis: lineTypeResetOpts[didx].xaxis,
+              };
+            } else if (plotType === matsTypes.PlotTypes.simpleScatter) {
+              updates[didx] = {
+                xaxis: lineTypeResetOpts[didx].xaxis,
+                yaxis: lineTypeResetOpts[didx].yaxis,
+              };
+            } else {
+              updates[didx] = {
+                yaxis: lineTypeResetOpts[didx].yaxis,
+              };
+            }
+            Plotly.restyle($("#placeholder")[0], updates[didx], didx);
+          }
         }
-        newOpts["yaxis.title"] = newAxisLabel;
-        newOpts["yaxis.range[0]"] = min - (max - min) * 0.125;
-        newOpts["yaxis.range[1]"] = max + (max - min) * 0.125;
-      }
-      Plotly.relayout($("#placeholder")[0], newOpts);
-      Session.set("axesCollapsed", true);
-    } else {
-      // separate x- or y-axes back out
-      const lineTypeResetOpts = Session.get("lineTypeResetOpts");
-      for (didx = 0; didx < dataset.length; didx += 1) {
         if (
-          reservedWords.indexOf(dataset[didx].label) === -1 &&
-          !dataset[didx].label.includes(matsTypes.ReservedWords.noSkill)
+          plotType === matsTypes.PlotTypes.profile ||
+          plotType === matsTypes.PlotTypes.simpleScatter
         ) {
-          if (plotType === matsTypes.PlotTypes.profile) {
-            updates[didx] = {
-              xaxis: lineTypeResetOpts[didx].xaxis,
-            };
-          } else if (plotType === matsTypes.PlotTypes.simpleScatter) {
-            updates[didx] = {
-              xaxis: lineTypeResetOpts[didx].xaxis,
-              yaxis: lineTypeResetOpts[didx].yaxis,
-            };
-          } else {
-            updates[didx] = {
-              yaxis: lineTypeResetOpts[didx].yaxis,
-            };
+          for (xidx = 0; xidx < xAxes.length; xidx += 1) {
+            newOpts[`${xAxes[xidx]}.title`] = options[xAxes[xidx]].title;
+            [newOpts[`${xAxes[xidx]}.range[0]`]] = options[xAxes[xidx]].range;
+            [, newOpts[`${xAxes[xidx]}.range[1]`]] = options[xAxes[xidx]].range;
           }
-          Plotly.restyle($("#placeholder")[0], updates[didx], didx);
         }
-      }
-      if (
-        plotType === matsTypes.PlotTypes.profile ||
-        plotType === matsTypes.PlotTypes.simpleScatter
-      ) {
-        for (xidx = 0; xidx < xAxes.length; xidx += 1) {
-          newOpts[`${xAxes[xidx]}.title`] = options[xAxes[xidx]].title;
-          newOpts[`${xAxes[xidx]}.range[0]`] = options[xAxes[xidx]].range[0];
-          newOpts[`${xAxes[xidx]}.range[1]`] = options[xAxes[xidx]].range[1];
+        if (plotType !== matsTypes.PlotTypes.profile) {
+          for (yidx = 0; yidx < yAxes.length; yidx += 1) {
+            newOpts[`${yAxes[yidx]}.title`] = options[yAxes[yidx]].title;
+            [newOpts[`${yAxes[yidx]}.range[0]`]] = options[yAxes[yidx]].range;
+            [, newOpts[`${yAxes[yidx]}.range[1]`]] = options[yAxes[yidx]].range;
+          }
         }
+        Plotly.relayout($("#placeholder")[0], newOpts);
+        Session.set("axesCollapsed", false);
       }
-      if (plotType !== matsTypes.PlotTypes.profile) {
-        for (yidx = 0; yidx < yAxes.length; yidx += 1) {
-          newOpts[`${yAxes[yidx]}.title`] = options[yAxes[yidx]].title;
-          newOpts[`${yAxes[yidx]}.range[0]`] = options[yAxes[yidx]].range[0];
-          newOpts[`${yAxes[yidx]}.range[1]`] = options[yAxes[yidx]].range[1];
-        }
+      // save the updates in case we want to pass them to a pop-out window.
+      for (let uidx = 0; uidx < updates.length; uidx += 1) {
+        saveUpdatesToJSON(updates[uidx], uidx);
       }
-      Plotly.relayout($("#placeholder")[0], newOpts);
-      Session.set("axesCollapsed", false);
-    }
-    // save the updates in case we want to pass them to a pop-out window.
-    for (let uidx = 0; uidx < updates.length; uidx += 1) {
-      saveUpdatesToJSON(updates[uidx], uidx);
     }
   },
   "click .axisXSpace"(event) {
@@ -1856,7 +1855,7 @@ Template.graph.events({
     }
   },
   "click .reCacheButton"() {
-    const plotType = Session.get("plotType");
+    Session.get("plotType");
     Session.set("expireKey", true);
     document.getElementById("plot-curves").click();
   },
@@ -2047,8 +2046,8 @@ Template.graph.events({
     const myDataIdx = dataset.findIndex(function (d) {
       return d.curveId === label;
     });
+    let update;
     if (dataset[myDataIdx].x.length > 0) {
-      var update;
       if (plotType !== matsTypes.PlotTypes.profile) {
         update = {
           "error_y.visible": dataset[myDataIdx].error_y.visible,
@@ -2084,8 +2083,8 @@ Template.graph.events({
     const myDataIdx = dataset.findIndex(function (d) {
       return d.curveId === label;
     });
+    let update;
     if (dataset[myDataIdx].x.length > 0) {
-      var update;
       if (dataset[myDataIdx].visible === "legendonly") {
         $(`#${id}`)[0].value = "hide bars";
         update = {
@@ -2127,8 +2126,9 @@ Template.graph.events({
     const myDataIdx = dataset.findIndex(function (d) {
       return d.curveId === label;
     });
+    let update;
     if (dataset[myDataIdx].x.length > 0) {
-      var update = {
+      update = {
         showlegend: !dataset[myDataIdx].showlegend,
       };
       if (update.showlegend) {
@@ -2198,6 +2198,13 @@ Template.graph.events({
     const options = Session.get("options");
     Session.set("thresholdEquiX", false);
     Session.set("axesCollapsed", false);
+    let lastCurveIndex;
+    let lineTypeResetOpts;
+    let thisAnnotation;
+    let annotationCurrentlyHidden;
+    let localAnnotation;
+    let barTypeResetOpts;
+    let mapResetOpts;
     if (curveOpsUpdate.length === 0) {
       // we just need a relayout
       Plotly.relayout($("#placeholder")[0], options);
@@ -2210,7 +2217,7 @@ Template.graph.events({
           // restyle for contour plots
           Plotly.restyle($("#placeholder")[0], Session.get("colorbarResetOpts"), 0);
           // deal with sig dots that some of the difference contours have
-          const lastCurveIndex = dataset.length - 1;
+          lastCurveIndex = dataset.length - 1;
           if (
             dataset[lastCurveIndex].label === matsTypes.ReservedWords.contourSigLabel &&
             dataset[lastCurveIndex].x.length > 0
@@ -2233,7 +2240,7 @@ Template.graph.events({
         case matsTypes.PlotTypes.gridscaleProb:
         case matsTypes.PlotTypes.simpleScatter:
           // restyle for line plots
-          const lineTypeResetOpts = Session.get("lineTypeResetOpts");
+          lineTypeResetOpts = Session.get("lineTypeResetOpts");
           for (let lidx = 0; lidx < lineTypeResetOpts.length; lidx += 1) {
             Plotly.restyle($("#placeholder")[0], lineTypeResetOpts[lidx], lidx);
             if (
@@ -2261,9 +2268,9 @@ Template.graph.events({
                 case matsTypes.PlotTypes.yearToYear:
                 case matsTypes.PlotTypes.scatter2d:
                 case matsTypes.PlotTypes.map:
-                  const thisAnnotation = $(`#legendContainer${dataset[lidx].label}`);
-                  const annotationCurrentlyHidden = thisAnnotation[0].hidden;
-                  const localAnnotation = `<div id='${dataset[lidx].label}-annotation' style='color:${lineTypeResetOpts[lidx]["line.color"]}'>${dataset[lidx].annotation} </div>`;
+                  thisAnnotation = $(`#legendContainer${dataset[lidx].label}`);
+                  annotationCurrentlyHidden = thisAnnotation[0].hidden;
+                  localAnnotation = `<div id='${dataset[lidx].label}-annotation' style='color:${lineTypeResetOpts[lidx]["line.color"]}'>${dataset[lidx].annotation} </div>`;
                   thisAnnotation.empty().append(localAnnotation);
                   thisAnnotation[0].hidden = annotationCurrentlyHidden;
                   thisAnnotation[0].style.display = thisAnnotation[0].hidden
@@ -2289,7 +2296,7 @@ Template.graph.events({
         case matsTypes.PlotTypes.histogram:
         case matsTypes.PlotTypes.ensembleHistogram:
           // restyle for bar plots
-          const barTypeResetOpts = Session.get("barTypeResetOpts");
+          barTypeResetOpts = Session.get("barTypeResetOpts");
           for (let bidx = 0; bidx < barTypeResetOpts.length; bidx += 1) {
             Plotly.restyle($("#placeholder")[0], barTypeResetOpts[bidx], bidx);
             if (
@@ -2303,7 +2310,7 @@ Template.graph.events({
           break;
         case matsTypes.PlotTypes.map:
           // restyle for maps
-          const mapResetOpts = Session.get("mapResetOpts");
+          mapResetOpts = Session.get("mapResetOpts");
           for (let midx = 0; midx < mapResetOpts.length; midx += 1) {
             Plotly.restyle($("#placeholder")[0], mapResetOpts[midx], midx);
           }
@@ -2421,7 +2428,7 @@ Template.graph.events({
           if (elem.value !== undefined && elem.value !== "") {
             if (!axesCollapsed || index === 0) {
               // if we've collapsed the axes we only want to process the first one
-              if (!isNaN(elem.value)) {
+              if (!matsMethods.isThisANaN(elem.value)) {
                 newOpts[
                   `xaxis${index === 0 ? "" : index + 1}.tickformat`
                 ] = `.${elem.value.toString()}r`;
@@ -2538,7 +2545,7 @@ Template.graph.events({
           if (elem.value !== undefined && elem.value !== "") {
             if (!axesCollapsed || index === 0) {
               // if we've collapsed the axes we only want to process the first one
-              if (!isNaN(elem.value)) {
+              if (!matsMethods.isThisANaN(elem.value)) {
                 newOpts[
                   `yaxis${index === 0 ? "" : index + 1}.tickformat`
                 ] = `.${elem.value.toString()}r`;
@@ -2549,6 +2556,7 @@ Template.graph.events({
     }
     $("[id$=legendFontSize]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           newOpts["legend.font.size"] = elem.value;
@@ -2556,6 +2564,7 @@ Template.graph.events({
       });
     $("[id$=legendFontColor]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           newOpts["legend.font.color"] = elem.value;
@@ -2589,6 +2598,9 @@ Template.graph.events({
     event.preventDefault();
     const plotType = Session.get("plotType");
     const dataset = matsCurveUtils.getGraphResult().data;
+    let thisAnnotation;
+    let annotationCurrentlyHidden;
+    let localAnnotation;
     const updates = [];
     // get input line style change
     $("[id$=LineColor]")
@@ -2628,9 +2640,9 @@ Template.graph.events({
               }
 
               // update the annotation with the new color
-              const thisAnnotation = $(`#legendContainer${dataset[index].curveId}`);
-              const annotationCurrentlyHidden = thisAnnotation[0].hidden;
-              const localAnnotation = `<div id='${dataset[index].curveId}-annotation' style='color:${elem.value}'>${dataset[index].annotation} </div>`;
+              thisAnnotation = $(`#legendContainer${dataset[index].curveId}`);
+              annotationCurrentlyHidden = thisAnnotation[0].hidden;
+              localAnnotation = `<div id='${dataset[index].curveId}-annotation' style='color:${elem.value}'>${dataset[index].annotation} </div>`;
               thisAnnotation.empty().append(localAnnotation);
               thisAnnotation[0].hidden = annotationCurrentlyHidden;
               thisAnnotation[0].style.display = thisAnnotation[0].hidden
@@ -2685,13 +2697,13 @@ Template.graph.events({
           updates[index]["marker.size"] = elem.value;
         }
       });
-    for (var uidx = 0; uidx < updates.length; uidx += 1) {
+    for (let uidx = 0; uidx < updates.length; uidx += 1) {
       // apply new settings
       Plotly.restyle($("#placeholder")[0], updates[uidx], uidx);
     }
 
     // save the updates in case we want to pass them to a pop-out window.
-    for (uidx = 0; uidx < updates.length; uidx += 1) {
+    for (let uidx = 0; uidx < updates.length; uidx += 1) {
       saveUpdatesToJSON(updates[uidx], uidx);
     }
     $("#lineTypeModal").modal("hide");
@@ -2714,13 +2726,13 @@ Template.graph.events({
           updates[index].name = elem.value;
         }
       });
-    for (var uidx = 0; uidx < updates.length; uidx += 1) {
+    for (let uidx = 0; uidx < updates.length; uidx += 1) {
       // apply new settings
       Plotly.restyle($("#placeholder")[0], updates[uidx], uidx);
     }
 
     // save the updates in case we want to pass them to a pop-out window.
-    for (uidx = 0; uidx < updates.length; uidx += 1) {
+    for (let uidx = 0; uidx < updates.length; uidx += 1) {
       curveOpsUpdate[uidx] =
         curveOpsUpdate[uidx] === undefined ? {} : curveOpsUpdate[uidx];
       curveOpsUpdate[uidx].name = updates[uidx].name;
@@ -2776,6 +2788,7 @@ Template.graph.events({
     // get input check box data
     $("[id$=filterPoint]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.checked === false) {
           const splitElemId = elem.id.split("---");
@@ -2783,12 +2796,12 @@ Template.graph.events({
           const indVal = splitElemId[1];
           for (let i = 0; i < dataset.length; i += 1) {
             if (dataset[i].label === curveLabel) {
-              var j;
-              var indArray;
+              let j;
+              let indArray;
               switch (plotType) {
                 // line plots only
                 case matsTypes.PlotTypes.profile:
-                  j = isNaN(Number(indVal))
+                  j = matsMethods.isThisANaN(Number(indVal))
                     ? dataset[i].y.indexOf(indVal)
                     : dataset[i].y.indexOf(Number(indVal));
                   break;
@@ -2800,7 +2813,7 @@ Template.graph.events({
                     dataset[i].binVals !== undefined
                       ? dataset[i].binVals
                       : dataset[i].threshold_all;
-                  j = isNaN(Number(indVal))
+                  j = matsMethods.isThisANaN(Number(indVal))
                     ? indArray.indexOf(indVal)
                     : indArray.indexOf(Number(indVal));
                   break;
@@ -2811,7 +2824,7 @@ Template.graph.events({
                 case matsTypes.PlotTypes.dailyModelCycle:
                 case matsTypes.PlotTypes.yearToYear:
                 case matsTypes.PlotTypes.gridscaleProb:
-                  j = isNaN(Number(indVal))
+                  j = matsMethods.isThisANaN(Number(indVal))
                     ? dataset[i].x.indexOf(indVal)
                     : dataset[i].x.indexOf(Number(indVal));
                   break;
@@ -2819,7 +2832,7 @@ Template.graph.events({
                   indArray = Session.get("thresholdEquiX")
                     ? dataset[i].origX
                     : dataset[i].x;
-                  j = isNaN(Number(indVal))
+                  j = matsMethods.isThisANaN(Number(indVal))
                     ? indArray.indexOf(indVal)
                     : indArray.indexOf(Number(indVal));
                   break;
@@ -2907,6 +2920,7 @@ Template.graph.events({
     // get new formatting
     $("input[id=colorbarLabel]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           update["colorbar.title"] = elem.value;
@@ -2916,6 +2930,7 @@ Template.graph.events({
       });
     $("input[id=colorbarMin]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           update.autocontour = false;
@@ -2924,6 +2939,7 @@ Template.graph.events({
       });
     $("input[id=colorbarMax]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           update.autocontour = false;
@@ -2932,6 +2948,7 @@ Template.graph.events({
       });
     $("input[id=colorbarNumber]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           update.autocontour = false;
@@ -2950,6 +2967,7 @@ Template.graph.events({
       });
     $("input[id=colorbarStep]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem.value !== undefined && elem.value !== "") {
           if (update.ncontours === undefined) {
@@ -2960,6 +2978,7 @@ Template.graph.events({
       });
     $("input[id=colorbarReverse]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem && elem.checked) {
           update.reversescale = true;
@@ -2969,6 +2988,7 @@ Template.graph.events({
       });
     $("input[id=nullSmooth]")
       .get()
+      // eslint-disable-next-line no-unused-vars
       .forEach(function (elem, index) {
         if (elem && elem.checked) {
           update.connectgaps = true;
@@ -2976,9 +2996,9 @@ Template.graph.events({
           update.connectgaps = false;
         }
       });
-    const elem = document.getElementById("colormapSelect");
-    if (elem !== undefined && elem.value !== undefined) {
-      update.colorscale = elem.value;
+    const thisElem = document.getElementById("colormapSelect");
+    if (thisElem !== undefined && thisElem.value !== undefined) {
+      update.colorscale = thisElem.value;
     }
     // apply new settings
     Plotly.restyle($("#placeholder")[0], update, 0);
@@ -2994,6 +3014,7 @@ Template.graph.events({
     ) {
       $("[id$=sigDotColor]")
         .get()
+        // eslint-disable-next-line no-unused-vars
         .forEach(function (elem, index) {
           update = {};
           if (elem.value !== undefined && elem.value !== "") {
diff --git a/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.html b/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.html
index 609116f1b..cfbad0d21 100644
--- a/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.html
+++ b/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.html
@@ -1,4 +1,4 @@
-<template name="GraphStandAlone">
+<template name="graphStandAlone">
   <head>
     <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
   </head>
diff --git a/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.js b/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.js
index 764a64099..25ad1d172 100644
--- a/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.js
+++ b/meteor_packages/mats-common/templates/graphStandAlone/graphStandAlone.js
@@ -2,9 +2,6 @@
  * Copyright (c) 2021 Colorado State University and Regents of the University of Colorado. All rights reserved.
  */
 
-import { Meteor } from "meteor/meteor";
-import jsPDF from "jspdf";
-import html2canvas from "html2canvas";
 import {
   matsCollections,
   matsCurveUtils,
@@ -14,13 +11,20 @@ import {
 } from "meteor/randyp:mats-common";
 import { Template } from "meteor/templating";
 import { FlowRouter } from "meteor/ostrio:flow-router-extra";
+import { moment } from "meteor/momentjs:moment";
 import "./graphStandAlone.html";
 
+/* global Session, Plotly, $, setError */
+/* eslint-disable no-console */
+
+const { jsPDF: JsPDF } = require("jspdf");
+const html2canvas = require("html2canvas");
+
 let resizeOptions;
 
-Template.GraphStandAlone.onCreated(function () {
+Template.graphStandAlone.onCreated(function () {
   // get the params for what this window will contain from the route
-  console.log("GraphStandAlone.onCreated");
+  console.log("graphStandAlone.onCreated");
   Session.set("route", FlowRouter.getRouteName());
   Session.set("graphFunction", FlowRouter.getParam("graphFunction"));
   Session.set("plotResultKey", FlowRouter.getParam("key"));
@@ -28,7 +32,7 @@ Template.GraphStandAlone.onCreated(function () {
   Session.set("appName", FlowRouter.getParam("appName"));
 });
 
-Template.GraphStandAlone.onRendered(function () {
+Template.graphStandAlone.onRendered(function () {
   // the window resize event needs to also resize the graph
   $(window).resize(function () {
     const plotType = Session.get("plotType");
@@ -42,12 +46,12 @@ Template.GraphStandAlone.onRendered(function () {
   document.getElementById("graph-container").style.backgroundColor = "white";
 });
 
-Template.GraphStandAlone.helpers({
+Template.graphStandAlone.helpers({
   /**
    * @return {string}
    * @return {string}
    */
-  graphFunction(params) {
+  graphFunction() {
     // causes graph display routine to be processed
     const graphFunction = FlowRouter.getParam("graphFunction");
     const key = FlowRouter.getParam("key");
@@ -64,69 +68,69 @@ Template.GraphStandAlone.helpers({
       Session.set("PlotResultsUpDated", new Date());
       Session.set("PlotParams", ret.result.basis.plotParams);
       const ptypes = Object.keys(ret.result.basis.plotParams.plotTypes);
-      for (let i = 0; i < ptypes.length; i++) {
+      for (let i = 0; i < ptypes.length; i += 1) {
         if (ret.result.basis.plotParams.plotTypes[ptypes[i]] === true) {
           Session.set("plotType", ptypes[i]);
           break;
         }
       }
-      if (graphFunction) {
-        eval(graphFunction)(key);
-        const plotType = Session.get("plotType");
-        const dataset = matsCurveUtils.getGraphResult().data;
-        let { options } = matsCurveUtils.getGraphResult();
-        if (dataset === undefined) {
+      matsGraphUtils.graphPlotly();
+      const plotType = Session.get("plotType");
+      const dataset = matsCurveUtils.getGraphResult().data;
+      let { options } = matsCurveUtils.getGraphResult();
+      if (dataset === undefined) {
+        return false;
+      }
+      // make sure to capture the options (layout) from the old graph - which were stored in graph.js
+      matsMethods.getLayout.call({ resultKey: key }, function (e, r) {
+        if (e !== undefined) {
+          setError(e);
           return false;
         }
-        // make sure to capture the options (layout) from the old graph - which were stored in graph.js
-        matsMethods.getLayout.call({ resultKey: key }, function (error, ret) {
-          if (error !== undefined) {
-            setError(error);
-            return false;
-          }
-          let mapLoadPause = 0;
-          options = ret.layout;
-          if (plotType === matsTypes.PlotTypes.map) {
-            options.mapbox.zoom = 2.75;
-            mapLoadPause = 1000;
-          }
-          options.hovermode = false;
-          resizeOptions = options;
+        let mapLoadPause = 0;
+        options = r.layout;
+        if (plotType === matsTypes.PlotTypes.map) {
+          options.mapbox.zoom = 2.75;
+          mapLoadPause = 1000;
+        }
+        options.hovermode = false;
+        resizeOptions = options;
 
-          // initial plot
-          $("#legendContainer").empty();
-          $("#placeholder").empty();
+        // initial plot
+        $("#legendContainer").empty();
+        $("#placeholder").empty();
 
-          // need a slight delay for plotly to load
+        // need a slight delay for plotly to load
+        setTimeout(function () {
+          Plotly.newPlot($("#placeholder")[0], dataset, options, {
+            showLink: false,
+            displayModeBar: false,
+          });
+          // update changes to the curve ops -- need to pause if we're doing a map so the map can finish loading before we try to edit it
           setTimeout(function () {
-            Plotly.newPlot($("#placeholder")[0], dataset, options, {
-              showLink: false,
-              displayModeBar: false,
-            });
-            // update changes to the curve ops -- need to pause if we're doing a map so the map can finish loading before we try to edit it
-            setTimeout(function () {
-              const updates = ret.curveOpsUpdate.curveOpsUpdate;
-              for (let uidx = 0; uidx < updates.length; uidx++) {
-                const curveOpsUpdate = {};
-                if (updates[uidx]) {
-                  const updatedKeys = Object.keys(updates[uidx]);
-                  for (let kidx = 0; kidx < updatedKeys.length; kidx++) {
-                    const jsonHappyKey = updatedKeys[kidx];
-                    // turn the json placeholder back into .
-                    const updatedKey = jsonHappyKey.split("____").join(".");
-                    curveOpsUpdate[updatedKey] = updates[uidx][jsonHappyKey];
-                  }
-                  Plotly.restyle($("#placeholder")[0], curveOpsUpdate, uidx);
+            const updates = r.curveOpsUpdate.curveOpsUpdate;
+            for (let uidx = 0; uidx < updates.length; uidx += 1) {
+              const curveOpsUpdate = {};
+              if (updates[uidx]) {
+                const updatedKeys = Object.keys(updates[uidx]);
+                for (let kidx = 0; kidx < updatedKeys.length; kidx += 1) {
+                  const jsonHappyKey = updatedKeys[kidx];
+                  // turn the json placeholder back into .
+                  const updatedKey = jsonHappyKey.split("____").join(".");
+                  curveOpsUpdate[updatedKey] = updates[uidx][jsonHappyKey];
                 }
+                Plotly.restyle($("#placeholder")[0], curveOpsUpdate, uidx);
               }
-            }, mapLoadPause);
-          }, 500);
+            }
+          }, mapLoadPause);
+        }, 500);
 
-          // append annotations
-          $("#legendContainer").append(ret.annotation);
-          document.getElementById("gsaSpinner").style.display = "none";
-        });
-      }
+        // append annotations
+        $("#legendContainer").append(r.annotation);
+        document.getElementById("gsaSpinner").style.display = "none";
+        return null;
+      });
+      return null;
     });
   },
   graphFunctionDispay() {
@@ -153,7 +157,7 @@ Template.GraphStandAlone.helpers({
     return Session.get("Curves");
   },
   plotName() {
-    return Session.get("PlotParams") === [] ||
+    return Session.get("PlotParams").length === 0 ||
       Session.get("PlotParams").plotAction === undefined ||
       Session.get("plotType") === matsTypes.PlotTypes.map
       ? ""
@@ -227,9 +231,10 @@ Template.GraphStandAlone.helpers({
   },
 });
 
-Template.GraphStandAlone.events({
-  "click .exportpdf"(e) {
+Template.graphStandAlone.events({
+  "click .exportpdf"() {
     $(".previewCurveButtons").each(function (i, obj) {
+      // eslint-disable-next-line no-param-reassign
       obj.style.display = "none";
     });
     html2canvas(document.querySelector("#graph-container"), { scale: 3.0 }).then(
@@ -237,31 +242,25 @@ Template.GraphStandAlone.events({
         const h = 419.53;
         const w = 595.28;
         const filename = document.getElementById("exportFileName").value;
-        const pdf = new jsPDF("letter", "pt", "a5");
+        const pdf = new JsPDF({
+          orientation: "landscape",
+          unit: "pt",
+          format: [w, h],
+        });
         pdf.addImage(canvas.toDataURL("image/jpeg"), "JPEG", 0, 0, w, h);
         pdf.save(filename);
         $(".previewCurveButtons").each(function (i, obj) {
+          // eslint-disable-next-line no-param-reassign
           obj.style.display = "block";
         });
       }
     );
   },
-  "click .exportpng"(e) {
+  "click .exportpng"() {
     $(".previewCurveButtons").each(function (i, obj) {
+      // eslint-disable-next-line no-param-reassign
       obj.style.display = "none";
     });
-    html2canvas(document.querySelector("#graph-container"), { scale: 3.0 }).then(
-      (canvas) => {
-        const h = 419.53;
-        const w = 595.28;
-        const filename = document.getElementById("exportFileName").value;
-        saveAs(canvas.toDataURL(), `${filename}.png`);
-        $(".previewCurveButtons").each(function (i, obj) {
-          obj.style.display = "block";
-        });
-      }
-    );
-
     function saveAs(uri, filename) {
       const link = document.createElement("a");
       if (typeof link.download === "string") {
@@ -280,5 +279,15 @@ Template.GraphStandAlone.events({
         window.open(uri);
       }
     }
+    html2canvas(document.querySelector("#graph-container"), { scale: 3.0 }).then(
+      (canvas) => {
+        const filename = document.getElementById("exportFileName").value;
+        saveAs(canvas.toDataURL(), `${filename}.png`);
+        $(".previewCurveButtons").each(function (i, obj) {
+          // eslint-disable-next-line no-param-reassign
+          obj.style.display = "block";
+        });
+      }
+    );
   },
 });