diff --git a/Application.php b/Application.php
index 0d0d61c7..cb5f6330 100644
--- a/Application.php
+++ b/Application.php
@@ -325,6 +325,7 @@ public static function getImportHTML() {
         }
         $str .= "<link rel='stylesheet' href='".self::link("/css/jquery.sweet-modal.min.css")."' />";
         $str .= "<script src='".self::link("/js/jquery.sweet-modal.min.js")."'></script>";
+        $str .= "<script src='".self::link("/js/html2canvas.min.js")."'></script>";
         $str .= "<script>function getCSRFToken() { return '".self::generateCSRFToken()."'; }</script>";
         return $str;
     }
@@ -406,7 +407,7 @@ public static function getHeader($tokenName = "", $token = "", $server = "", $pi
         if ($base64 = $module->getBrandLogo()) {
             $str .= "<div class='topBar' style='float:right;'><img src='$base64' class='brandLogo'></div>";
         } else {
-            $str .= "<div class='topBar' style='float:right;'><p class='recessed'>$tokenName</p></div>";
+            $str .= "<div class='topBar' style='float:right;'><p class='alignright greytext padded nomargin bolded'>$tokenName</p></div>";
         }
         $str .= "</div>";
         $str .= "</header>";
@@ -584,9 +585,12 @@ public static function getMenteeAgreementLink($pid) {
                 echo "plugin project<br>";
             }
             global $info;
-            if (isset($info['prod'])) {
+            if (isset($info['prod']) && Application::isVanderbilt()) {
                 $sourcePid = $info['prod']['pid'];
                 return self::link("mentor/intro.php", $sourcePid, TRUE);
+            } else if (isset($info['localhost']) && Application::isLocalhost()) {
+                $sourcePid = $info['localhost']['pid'];
+                return self::link("mentor/intro.php", $sourcePid, TRUE);
             }
             self::log("Warning! Could not find prod in info!");
         } else if (CareerDev::isCopiedProject($pid)) {
@@ -630,6 +634,13 @@ public static function getExporterFields($metadata) {
         return REDCapManagement::screenForFields($metadata, CareerDev::$exporterFields);
     }
 
+    public static function isMSTP($pid = NULL) {
+        if (!$pid) {
+            $pid = CareerDev::getPid();
+        }
+        return Application::isVanderbilt() && ($pid == 149668);   // TODO For now
+    }
+
     public static function getMSTPHashFields() {
         $roles = self::getMSTPConfig();
         $fields = [];
diff --git a/CareerDev.php b/CareerDev.php
index 818da45c..abd0127a 100644
--- a/CareerDev.php
+++ b/CareerDev.php
@@ -22,7 +22,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "5.9.2";
+		return "5.10.0";
 	}
 
 	public static function getLockFile($pid) {
@@ -424,7 +424,7 @@ public static function getModule() {
     public static function getRootDir($withWebroot = FALSE) {
         global $server;
         $directoryDir = "/plugins/";
-        if ($withWebroot) {
+        if ($withWebroot && $server) {
             $newWebroot = str_replace("/api/", "", $server);
         } else if (Application::isLocalhost()) {
             $newWebroot = "https://localhost/redcap";
diff --git a/FlightTrackerExternalModule.php b/FlightTrackerExternalModule.php
index fee6c3cd..2b8618e2 100755
--- a/FlightTrackerExternalModule.php
+++ b/FlightTrackerExternalModule.php
@@ -43,6 +43,9 @@ function batch() {
         Application::increaseProcessingMax(8);
         $this->setupApplication();
         $activePids = $this->getPids();
+        foreach ($activePids as $pid) {
+            Application::log("Minute cron running", $pid);      // TODO Remove - temporary
+        }
         foreach ($activePids as $pid) {
             # note return at end of successful run because only need to run once
             $token = $this->getProjectSetting("token", $pid);
@@ -63,6 +66,8 @@ function batch() {
                     \REDCap::email($adminEmail, "noreply.flighttracker@vumc.org", "Flight Tracker Batch Job Exception", $mssg);
                 }
                 return;
+            } else {
+                Application::log("No token or server", $pid);
             }
         }
     }
@@ -74,6 +79,7 @@ function getPids() {
 	function emails() {
 	    $this->setupApplication();
         $activePids = $this->getPids();
+        $oneHour = 3600;
         // CareerDev::log($this->getName()." sending emails for pids ".json_encode($pids));
 		foreach ($activePids as $pid) {
 			if (REDCapManagement::isActiveProject($pid)) {
@@ -85,7 +91,7 @@ function emails() {
                         $tokenName = $this->getProjectSetting("tokenName", $pid);
                         $adminEmail = $this->getProjectSetting("admin_email", $pid);
                         $cronStatus = $this->getProjectSetting("send_cron_status", $pid);
-                        if ($cronStatus) {
+                        if ($cronStatus && (time() <= $cronStatus + $oneHour)) {
                             $mgr = new CronManager($token, $server, $pid, $this);
                             loadTestingCrons($mgr);
                             $mgr->run($adminEmail, $tokenName);
@@ -281,7 +287,6 @@ public function shareDataInternally($pidsSource, $pidsDest) {
         $tokens = [];
         $metadataFields = [];
         $choices = [];
-        $pidsUpdated = [];
 
         $allPids = array_unique(array_merge($pidsSource, $pidsDest));
 	    foreach ($allPids as $pid) {
@@ -339,62 +344,105 @@ public function shareDataInternally($pidsSource, $pidsDest) {
         }
 
 	    # push
-	    foreach ($pidsSource as $i => $sourcePid) {
-	        Application::log("Searching through pid $sourcePid", $sourcePid);
-	        if ($tokens[$sourcePid] && $servers[$sourcePid]) {
+        $usedMatches = self::findMatches($pidsSource, $pidsDest, $tokens, $servers, $firstNames, $lastNames);
+        return $this->processMatches($usedMatches, $tokens, $servers, $forms, $metadataFields, $choices);
+	}
+
+    private function processMatches($matches, $tokens, $servers, $forms, $metadataFields, $choices) {
+        $pidsUpdated = [];
+        foreach ($matches as $destLicencePlate => $sourceMatches) {
+            list($destPid, $destRecordId) = explode(":", $destLicencePlate);
+            $destToken = $tokens[$destPid];
+            $destServer = $servers[$destPid];
+            foreach ($sourceMatches as $sourceLicensePlate) {
+                list($sourcePid, $sourceRecordId) = explode(":", $sourceLicensePlate);
+                $sourceInfo = [
+                    "token" => $tokens[$sourcePid],
+                    "server" => $servers[$sourcePid],
+                    "pid" => $sourcePid,
+                    "record" => $sourceRecordId,
+                ];
+                $destInfo = [
+                    "token" => $destToken,
+                    "server" => $destServer,
+                    "pid" => $destPid,
+                    "record" => $destRecordId,
+                ];
+                $this->copyFormData($completes, $pidsUpdated, $forms, $sourceInfo, $destInfo, $metadataFields, $choices);
+                $this->copyWranglerData($pidsUpdated, $sourceInfo, $destInfo);
+            }
+        }
+        return $pidsUpdated;
+    }
+
+    private static function findMatches($pidsSource, $pidsDest, $tokens, $servers, $firstNames, $lastNames) {
+        $usedMatches = [];   // key is license plate of dest
+        $searchedFor = [];
+        foreach ($pidsSource as $sourcePid) {
+            Application::log("Searching through pid $sourcePid", $sourcePid);
+            if ($tokens[$sourcePid] && $servers[$sourcePid]) {
                 $sourceToken = $tokens[$sourcePid];
                 $sourceServer = $servers[$sourcePid];
-                foreach ($pidsDest as $i2 => $destPid) {
+                $sourceRecords = Download::recordIds($sourceToken, $sourceServer);
+                foreach ($pidsDest as $destPid) {
                     if (($destPid != $sourcePid) && $tokens[$destPid] && $servers[$destPid]) {
                         Application::log("Communicating between $sourcePid and $destPid", $destPid);
-                        $destToken = $tokens[$destPid];
-                        $destServer = $servers[$destPid];
                         foreach (array_keys($firstNames[$destPid] ?? []) as $destRecordId) {
-                            $combos = [];
-                            foreach (NameMatcher::explodeFirstName($firstNames[$destPid][$destRecordId] ?? "") as $firstName) {
-                                foreach (NameMatcher::explodeLastName($lastNames[$destPid][$destRecordId] ?? "") as $lastName) {
-                                    if ($firstName && $lastName) {
-                                        $combos[] = ["first" => $firstName, "last" => $lastName];
+                            $destCombos = self::explodeAllNames($firstNames[$destPid][$destRecordId] ?? "", $lastNames[$destPid][$destRecordId] ?? "");
+                            $searchedFor[] = "$destPid:$destRecordId";
+                            foreach ($sourceRecords as $sourceRecordId) {
+                                if (in_array("$sourcePid:$sourceRecordId", $searchedFor)) {
+                                    # searched for other way - makes algorithm O(n*log(n)) instead of O(n^2)
+                                    if (
+                                        isset($usedMatches["$sourcePid:$sourceRecordId"])
+                                        && in_array("$destPid:$destRecordId", $usedMatches["$sourcePid:$sourceRecordId"])
+                                    ) {
+                                        if (!isset($usedMatches["$destPid:$destRecordId"])) {
+                                            $usedMatches["$destPid:$destRecordId"] = [];
+                                        }
+                                        $usedMatches["$destPid:$destRecordId"][] = "$sourcePid:$sourceRecordId";
+                                    }
+                                } else {
+                                    $sourceCombos = self::explodeAllNames($firstNames[$sourcePid][$sourceRecordId] ?? "", $lastNames[$sourcePid][$sourceRecordId] ?? "");
+                                    foreach ($destCombos as $destAry) {
+                                        $firstName = $destAry["first"];
+                                        $lastName = $destAry["last"];
+                                        Application::log("Searching for $firstName $lastName from $destPid in $sourcePid", $sourcePid);
+                                        Application::log("Searching for $firstName $lastName from $destPid in $sourcePid", $destPid);
+                                        foreach ($sourceCombos as $sourceAry) {
+                                            if (NameMatcher::matchName($firstName, $lastName, $sourceAry['first'], $sourceAry['last'])) {
+                                                Application::log("Match in above: source ($sourcePid, $sourceRecordId) to dest ($destPid, $destRecordId)", $sourcePid);
+                                                Application::log("Match in above: source ($sourcePid, $sourceRecordId) to dest ($destPid, $destRecordId)", $destPid);
+                                                if (!isset($usedMatches["$destPid:$destRecordId"])) {
+                                                    $usedMatches["$destPid:$destRecordId"] = [];
+                                                }
+                                                $usedMatches["$destPid:$destRecordId"][] = "$sourcePid:$sourceRecordId";
+                                                break;
+                                            }
+                                        }
                                     }
                                 }
                             }
-                            foreach ($combos as $nameAry) {
-                                $firstName = $nameAry["first"];
-                                $lastName = $nameAry["last"];
-                                Application::log("Searching for $firstName $lastName from $destPid in $sourcePid", $sourcePid);
-                                Application::log("Searching for $firstName $lastName from $destPid in $sourcePid", $destPid);
-                                $originalPid = CareerDev::getPid();
-                                CareerDev::setPid($sourcePid);
-                                if ($sourceRecordId = NameMatcher::matchName($firstName, $lastName, $sourceToken, $sourceServer)) {
-                                    Application::log("Match in above: source ($sourcePid, $sourceRecordId) to dest ($destPid, $destRecordId)", $sourcePid);
-                                    Application::log("Match in above: source ($sourcePid, $sourceRecordId) to dest ($destPid, $destRecordId)", $destPid);
-
-                                    $sourceInfo = [
-                                        "token" => $sourceToken,
-                                        "server" => $sourceServer,
-                                        "pid" => $sourcePid,
-                                        "record" => $sourceRecordId,
-                                    ];
-                                    $destInfo = [
-                                        "token" => $destToken,
-                                        "server" => $destServer,
-                                        "pid" => $destPid,
-                                        "record" => $destRecordId,
-                                    ];
-                                    $this->copyFormData($completes, $pidsUpdated, $forms, $sourceInfo, $destInfo, $metadataFields, $choices);
-                                    $this->copyWranglerData($pidsUpdated, $sourceInfo, $destInfo);
-                                    break; // combos foreach
-                                    # if more than one match, match only first name matched
-                                }
-                                CareerDev::setPid($originalPid);
-                            }
                         }
                     }
                 }
             }
         }
-	    return $pidsUpdated;
-	}
+        return $usedMatches;
+    }
+
+    private static function explodeAllNames($lastName, $firstName) {
+        $combos = [];
+        foreach (NameMatcher::explodeFirstName($firstName) as $firstName) {
+            foreach (NameMatcher::explodeLastName($lastName) as $lastName) {
+                if ($firstName && $lastName) {
+                    $combos[] = ["first" => $firstName, "last" => $lastName];
+                }
+            }
+        }
+        return $combos;
+    }
+
 
 	public function copyWranglerData(&$pidsUpdated, $sourceInfo, $destInfo) {
 	    $hasCopiedPubData = $this->copyPubData($sourceInfo, $destInfo);
@@ -653,7 +701,11 @@ private function processInstrument($instrument, $forms, $completeData, &$destDat
 
         if ($config['formType'] == "repeating") {
             $canGo = FALSE;
-            $dataValues = array_values($completeData[$sourcePid][$sourceRecordId] ?: []);
+            if (is_array($completeData[$sourcePid][$sourceRecordId] ?: [])) {
+                $dataValues = array_values($completeData[$sourcePid][$sourceRecordId] ?: []);
+            } else {
+                $dataValues = [$completeData[$sourcePid][$sourceRecordId]];
+            }
             foreach ($markedAsComplete as $completeValue) {
                 if (in_array($completeValue, $dataValues)) {
                     $canGo = TRUE;
diff --git a/add.php b/add.php
index 826e0a62..f783614c 100644
--- a/add.php
+++ b/add.php
@@ -10,6 +10,7 @@
 use \Vanderbilt\CareerDevLibrary\REDCapLookup;
 use \Vanderbilt\CareerDevLibrary\NIHTables;
 
+
 require_once(dirname(__FILE__)."/charts/baseWeb.php");
 require_once(dirname(__FILE__)."/classes/Autoload.php");
 
@@ -69,25 +70,25 @@
 		}
 	} else if ($_POST['action'] == "importText") {
 	    $list = REDCapManagement::sanitize($_POST['newnames']);
-		$rows = explode("\n", $list);
-		foreach ($rows as $row) {
-			if ($row) {
-				$nodes = preg_split("/\s*[,\t]\s*/", $row);
-				if (count($nodes) == 6) {
-					$lines[] = $nodes;
-				} else {
+        $rows = explode("\n", $list);
+        foreach ($rows as $row) {
+            if ($row) {
+                $nodes = preg_split("/\s*[,\t]\s*/", $row);
+                if (count($nodes) == 6) {
+                    $lines[] = $nodes;
+                } else {
                     $link = Application::link("this").$createRecordsURI;
                     $mssg = "A line does not contain the necessary 6 columns. No data have been added. Please try again.";
                     exitProcess($mssg, $link);
                     exit;
-				}
-			}
-		}
+                }
+            }
+        }
 	} else {
         throw new \Exception("This should never happen.");
     }
 	$mentorUids = getUidsForMentors($lines);
-	if (!empty($mentorUids) || Application::isLocalhost()) {
+	if (!empty($mentorUids)) {
         echo makeAdjudicationTable($lines, $mentorUids, [], []);
         $url = APP_PATH_WEBROOT."ProjectGeneral/keep_alive.php?pid=".$pid;
         echo "<script>
diff --git a/brag.php b/brag.php
index 31c22992..62049944 100644
--- a/brag.php
+++ b/brag.php
@@ -11,6 +11,7 @@
 use \Vanderbilt\CareerDevLibrary\Application;
 use \Vanderbilt\CareerDevLibrary\Altmetric;
 use \Vanderbilt\CareerDevLibrary\Cohorts;
+use \Vanderbilt\CareerDevLibrary\Links;
 
 if (!isset($_GET['showHeaders'])) {
     define("NOAUTH", TRUE);
@@ -39,7 +40,7 @@
 $currRecord = FALSE;
 $currName = "";
 $names = Download::names($token, $server);
-if ($_GET['record']) {
+if (isset($_GET['record']) && ($_GET['record'] !== "")) {
     $currRecord = REDCapManagement::getSanitizedRecord($_GET['record'], $recordIds);
     if ($currRecord && ($currRecord != 'all')) {
         $recordIds = [$currRecord];
@@ -85,7 +86,7 @@
         $noCitationsMessage = "The widget has not yet been configured.";
     }
 
-    $url = Application::link("this", $pid, TRUE);
+    $url = (empty($_SERVER['HTTPS']) ? 'http' : 'https') . "://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
     $url = preg_replace("/\&showHeaders[^\&]*/", "", $url);
     $url = preg_replace("/showHeaders[^\&]*\&/", "", $url);
     $url .= "&NOAUTH";
@@ -196,7 +197,6 @@
 } else {
     $asc = FALSE;
 }
-$allCitations = [];
 $allPMIDs = [];
 $multipleScholarPMIDs = [];
 $firstNames = Download::firstnames($token, $server);
@@ -212,7 +212,26 @@
     $trainingFields[] = "summary_award_end_date_".$i;
 }
 $trainingFields = REDCapManagement::filterOutInvalidFields($metadata, $trainingFields);
-$citationFields = Application::getCitationFields($metadata);
+$citationFields = [
+    "record_id",
+    "citation_pmid",
+    "citation_include",
+    "citation_flagged",
+    "citation_ts",
+    "citation_pmcid",
+    "citation_doi",
+    "citation_authors",
+    "citation_title",
+    "citation_pub_types",
+    "citation_mesh_terms",
+    "citation_journal",
+    "citation_volume",
+    "citation_issue",
+    "citation_year",
+    "citation_month",
+    "citation_day",
+    "citation_pages",
+];
 if (isset($_GET['test'])) {
     echo "Records: ".json_encode($recordIds)."<br>";
 }
@@ -231,6 +250,7 @@
     }
 }
 
+$instancesToDownload = [];
 foreach ($recordIds as $recordId) {
     if ($hasAfterTraining) {
         $trainingData = Download::fieldsForRecords($token, $server, $trainingFields, [$recordId]);
@@ -277,7 +297,11 @@
 
     if (in_array("citation_ts", $metadataFields)) {
         if ($hasTimestampData) {
-            $includeData = Download::fieldsForRecords($token, $server, ["record_id", "citation_include"],[$recordId]);
+            $includeData = Download::fieldsForRecords($token, $server, ["record_id", "citation_include"], [$recordId]);
+            if (isset($_GET['test'])) {
+                Application::log("Record $recordId has includeData " . REDCapManagement::json_encode_with_spaces($includeData), $pid);
+            }
+
             $includes = [];
             $timestamps = $timestampFieldData[$recordId] ?? [];
             foreach ($includeData as $row) {
@@ -285,55 +309,114 @@
                     $includes[$row['redcap_repeat_instance']] = $row['citation_include'];
                 }
             }
+            if (isset($_GET['test'])) {
+                Application::log("Record $recordId has includes " . REDCapManagement::json_encode_with_spaces($includes), $pid);
+            }
 
-            $instancesToDownload = [];
+            $instancesToDownload[$recordId] = [];
             foreach ($includes as $instance => $value) {
                 $ts = REDCapManagement::isDate($timestamps[$instance] ?? "") ? strtotime($timestamps[$instance]) : FALSE;
-                if ($ts && ($value == 1) && ($ts >= $startTs) && ($ts <= $endTs)) {
-                    $instancesToDownload[] = $instance;
+                if (isset($_GET['test'])) {
+                    Application::log("Record $recordId Instance $instance comparing " . date("Y-m-d", $ts) . " and " . date("Y-m-d", $startTs) . " - " . date("Y-m-d", $endTs), $pid);
+                }
+                if ($ts && ($value == 1) && ($ts >= $startTs) && (($endTs === FALSE) || ($ts <= $endTs))) {
+                    $instancesToDownload[$recordId][] = $instance;
                 }
             }
-            $redcapData = Download::fieldsForRecordAndInstances($token, $server, $citationFields, $recordId, "citation", $instancesToDownload);
-        } else {
-            $redcapData = Download::fieldsForRecords($token, $server, $citationFields, [$recordId]);
         }
-    } else {
-        $redcapData = Download::fieldsForRecords($token, $server, $citationFields, [$recordId]);
     }
+}
 
-    $pubs = new Publications($token, $server, $pid);
-    $pubs->setRows($redcapData);
-    $recordCitations = $pubs->getSortedCitationsInTimespan($startTs, $endTs, "Included", FALSE);
-    foreach ($recordCitations as $citation) {
-        $pmid = $citation->getPMID();
-        if (isset($allPMIDs[$pmid])) {
-            if (!isset($multipleScholarPMIDs[$pmid])) {
-                $multipleScholarPMIDs[$pmid] = [];
-                $multipleScholarPMIDs[$pmid][] = $allPMIDs[$pmid];
-            }
-            $multipleScholarPMIDs[$pmid][] = ["lastName" => $lastNames[$recordId], "firstName" => $firstNames[$recordId]];
-        } else {
-            $allCitations[] = $citation;
-            $allPMIDs[$pmid] = ["lastName" => $lastNames[$recordId], "firstName" => $firstNames[$recordId]];
-        }
+$totalToDownload = 0;
+foreach ($instancesToDownload as $recordId => $instancesForRecord) {
+    $totalToDownload += count($instancesForRecord);
+}
+
+$doQuickWay = ($totalToDownload > 75);
+if ($doQuickWay) {
+    $citationFields = ["record_id", "citation_pmid", "citation_include", "citation_ts", "citation_full_citation", "citation_doi"];
+    if (isset($_GET['test'])) {
+        Application::log("DOING QUICK WAY", $pid);
     }
 }
 
 $citationsWithTs = [];
-foreach ($allCitations as $citation) {
-    if (isset($_GET['altmetrics'])) {
-        $citationStr = $citation->getImage("left");
+foreach ($recordIds as $recordId) {
+    if (isset($instancesToDownload[$recordId])) {
+        $redcapData = Download::fieldsForRecordAndInstances($token, $server, $citationFields, $recordId, "citation", $instancesToDownload[$recordId]);
     } else {
-        $citationStr = "";
+        $redcapData = Download::fieldsForRecords($token, $server, $citationFields, [$recordId]);
     }
-    $pmid = $citation->getPMID();
-    if (isset($multipleScholarPMIDs[$pmid])) {
-        // Application::log("Calling getCitation $pmid with multiple: ".REDCapManagement::json_encode_with_spaces($multipleScholarPMIDs[$pmid]));
-        $citationStr .= $citation->getCitation($multipleScholarPMIDs[$pmid]);
-    } else {
-        $citationStr .= $citation->getCitationWithLink(FALSE, TRUE);
+    if (isset($_GET['test'])) {
+        Application::log("Record $recordId has ".count($redcapData)." rows of REDCap data", $pid);
     }
-    $citationsWithTs[$citationStr] = $citation->getTimestamp();
+
+    if ($doQuickWay && !empty($redcapData)) {
+        foreach ($redcapData as $row) {
+            if (isset($_GET['test'])) {
+                Application::log("Record $recordId row: ".json_encode($row));
+            }
+            $ts = $row['citation_ts'] ? strtotime($row['citation_ts']) : FALSE;
+            if (
+                $row['citation_include']
+                && $ts
+                && ($ts >= $startTs)
+                && (
+                    ($endTs === FALSE)
+                    || ($ts <= $endTs)
+                )
+            ) {
+                $pmid = $row['citation_pmid'];
+                $doi = $row['citation_doi'];
+                $citationStr = $row['citation_full_citation']." ".Links::makeLink(Citation::getURLForPMID($pmid), "PubMed PMID: $pmid", TRUE);
+                $citationStr = str_replace("doi:$doi", Links::makeLink("https://www.doi.org/".$doi, "doi:$doi", TRUE), $citationStr);
+                $citationsWithTs[$citationStr] = $ts;
+            }
+        }
+    } else if (!empty($redcapData)) {
+        $allCitations = [];
+        $pubs = new Publications($token, $server, $metadata);
+        $pubs->setRows($redcapData);
+        $recordCitations = $pubs->getSortedCitationsInTimespan($startTs, $endTs, "Included", FALSE);
+        if (isset($_GET['test'])) {
+            Application::log("Record $recordId has ".count($recordCitations)." citations", $pid);
+        }
+        foreach ($recordCitations as $citation) {
+            $pmid = $citation->getPMID();
+            if (isset($allPMIDs[$pmid])) {
+                if (!isset($multipleScholarPMIDs[$pmid])) {
+                    $multipleScholarPMIDs[$pmid] = [];
+                    $multipleScholarPMIDs[$pmid][] = $allPMIDs[$pmid];
+                }
+                $multipleScholarPMIDs[$pmid][] = ["lastName" => $lastNames[$recordId], "firstName" => $firstNames[$recordId]];
+            } else {
+                $allCitations[] = $citation;
+                $allPMIDs[$pmid] = ["lastName" => $lastNames[$recordId], "firstName" => $firstNames[$recordId]];
+            }
+        }
+        if (isset($_GET['test'])) {
+            Application::log("All Citations ".count($allCitations), $pid);
+        }
+        foreach ($allCitations as $citation) {
+            if (isset($_GET['altmetrics'])) {
+                $citationStr = $citation->getImage("left");
+            } else {
+                $citationStr = "";
+            }
+            $pmid = $citation->getPMID();
+            if (isset($multipleScholarPMIDs[$pmid])) {
+                // Application::log("Calling getCitation $pmid with multiple: ".REDCapManagement::json_encode_with_spaces($multipleScholarPMIDs[$pmid]));
+                $citationStr .= $citation->getCitation($multipleScholarPMIDs[$pmid]);
+            } else {
+                $citationStr .= $citation->getCitationWithLink(FALSE, TRUE);
+            }
+            $citationsWithTs[$citationStr] = $citation->getTimestamp();
+        }
+    }
+}
+
+if (isset($_GET['test'])) {
+    Application::log("Citations with TS ".count($citationsWithTs), $pid);
 }
 
 if ($asc) {
@@ -420,7 +503,7 @@ function makeOrList($units, $suffix, $ary) {
                 $priorities[] = "'#$unit2$suffix'";
             }
         }
-        $html[] = "<label for='$unit$suffix'>$ucUnit:</label> <input onchange=\"enforceOneNumber(".implode(", ", $priorities).");\" type=\"number\" min=\"0\" id=\"$unit$suffix\" name=\"$unit$suffix\" style=\"width: 75px;\" value=\"{$ary['days']}\" />";
+        $html[] = "<label for='$unit$suffix'>$ucUnit:</label> <input onchange=\"enforceOneNumber(".implode(", ", $priorities).");\" type=\"number\" min=\"0\" id=\"$unit$suffix\" name=\"$unit$suffix\" style=\"width: 75px;\" value=\"{$ary[$unit]}\" />";
     }
     return implode("&nbsp;<strong>-OR-</strong>&nbsp;", $html);
 }
\ No newline at end of file
diff --git a/charts/timeline.php b/charts/timeline.php
index 54eec6b6..b33cce17 100644
--- a/charts/timeline.php
+++ b/charts/timeline.php
@@ -21,7 +21,7 @@
 require_once(dirname(__FILE__)."/../small_base.php");
 
 
-$classes = ["CDAs", "All"];
+$classes = ["PubsCDAs", "All"];
 if (Grants::areFlagsOn($pid)) {
     $classes[] = "Flagged";
 }
@@ -118,14 +118,16 @@
         }
         if ($c == "All") {
             $grantType = "all";
-        } else if ($c == "CDAs") {
+        } else if (($c == "PubsCDAs") && !isset($_GET['noCDA'])) {
             $grantType = "prior";
+        } else if (($c == "PubsCDAs") && isset($_GET['noCDA'])) {
+            $grantType = "NONE";
         } else if ($c == "Flagged") {
             $grantType = "flagged";
         } else {
             throw new \Exception("Class is not set up $c");
         }
-        if ($grants->getCount($grantType) > 0) {
+        if (($grantType !== "NONE") && ($grants->getCount($grantType) > 0)) {
             if (isset($_GET['test'])) {
                 echo "grants->$grantType has ".$grants->getCount($grantType)." items<br>";
             }
@@ -133,7 +135,7 @@
             $grantsAndPubs[$c] = array_merge($grantsAndPubs[$c], $grantBars);
         }
 
-        if ($c == "CDAs") {
+        if ($c == "PubsCDAs") {
             $pubDots = makePubDots($rows, $token, $server, $id, $minTs[$c], $maxTs[$c]);
             $grantsAndPubs[$c] = array_merge($grantsAndPubs[$c], $pubDots);
         }
@@ -155,9 +157,13 @@
 }
 
 foreach ($classes as $c) {
-    if ($c == "All") {
+    if (($c == "All") && $hasSubmissions) {
         $vizTitle = "All Grants (Including Submissions)";
-    } else if ($c == "CDAs") {
+    } else if (($c == "All") && !$hasSubmissions) {
+        $vizTitle = "All Grants";
+    } else if (($c == "PubsCDAs") && isset($_GET['noCDA'])) {
+        $vizTitle = "Publications";
+    } else if (($c == "PubsCDAs") && !isset($_GET['noCDA'])) {
         $vizTitle = "Career Defining Awards &amp; Publications";
     } else if ($c == "Flagged") {
         $vizTitle = "Flagged Grants Only";
@@ -175,16 +181,17 @@
         echo "</tr></tbody></table>";
     }
     echo "<div id='visualization".$pid."_$c' class='visualization'></div>";
+    echo "<div class='alignright'><button onclick='html2canvas(container_{$pid}[\"$c\"], { onrendered: (canvas) => { downloadCanvas(canvas, \"timeline.png\"); } }); return false;' class='smallest'>Save</button></div>";
 }
 
 ?>
 
 <script type="text/javascript">
-$(document).ready(function() {
-    const container_<?= $pid ?> = [];
-    const items_<?= $pid ?> = [];
-    const options_<?= $pid ?> = [];
-    const timeline_<?= $pid ?> = [];
+const container_<?= $pid ?> = {};
+const items_<?= $pid ?> = {};
+const options_<?= $pid ?> = {};
+const timeline_<?= $pid ?> = {};
+$(document).ready(() => {
     <?php
     foreach ($classes as $c) {
         $dataset = json_encode($grantsAndPubs[$c]);
@@ -272,7 +279,7 @@ function addIfValid($grant, &$grantsAndPubs, &$submissionTimestamps, &$id, $awar
             $grantNumber = $awardStatus.": ".$truncatedTitle;
         }
         $url = $grant->getVariable("url");
-        $grantAry['content'] = Links::makeLink($url, $grantNumber, TRUE);
+        $grantAry['content'] = isset($_GET['hideHeaders']) ? $grantNumber : Links::makeLink($url, $grantNumber, TRUE);
         $grantsAndPubs[] = $grantAry;
         $id++;
     }
diff --git a/classes/Crons.php b/classes/Crons.php
index b9262635..017cafdb 100644
--- a/classes/Crons.php
+++ b/classes/Crons.php
@@ -354,7 +354,12 @@ public function runBatchJobs($numRunBeforeInCron = 0) {
             return;
         }
         self::upgradeBatchQueueIfNecessary($batchQueue, $module);
-        if ((count($batchQueue) == 1) && in_array($batchQueue[0]['status'], ["ERROR", "DONE"])) {
+        if (
+            (
+                (count($batchQueue) == 1) && in_array($batchQueue[0]['status'], ["ERROR", "DONE"])
+            )
+            || (count($batchQueue) > 5000)
+        ){
             self::saveBatchQueueToDB([], $module);
             return;
         }
diff --git a/classes/DataDictionaryManagement.php b/classes/DataDictionaryManagement.php
index c3621a3f..945f32f7 100644
--- a/classes/DataDictionaryManagement.php
+++ b/classes/DataDictionaryManagement.php
@@ -918,6 +918,7 @@ public static function mergeMetadataAndUpload($originalMetadata, $newMetadata, $
         }
         foreach ($selectedRows as $newRow) {
             if (!in_array($newRow['field_name'], $fieldsToDelete)) {
+                $existingMetadataFields = self::getFieldsFromMetadata($existingMetadata);
                 $priorRowField = end($existingMetadata)['field_name'];
                 foreach ($newMetadata as $row) {
                     if ($row['field_name'] == $newRow['field_name']) {
@@ -925,10 +926,12 @@ public static function mergeMetadataAndUpload($originalMetadata, $newMetadata, $
                     } else if (
                         !preg_match($deletionRegEx, $row['field_name'])
                         && !in_array($row['field_name'], $fieldsToDelete)
+                        && in_array($row['field_name'], $existingMetadataFields)
                     ) {
                         $priorRowField = $row['field_name'];
                     }
                 }
+
                 # no longer needed because now allow to finish current form
                 // if (self::atEndOfMetadata($priorRowField, $selectedRows, $newMetadata)) {
                 // $priorRowField = end($originalMetadata)['field_name'];
diff --git a/classes/Download.php b/classes/Download.php
index 3aa919cb..f0fda2b2 100644
--- a/classes/Download.php
+++ b/classes/Download.php
@@ -227,16 +227,16 @@ public static function primaryMentors($token, $server) {
 		$mentors = self::oneField($token, $server, "summary_mentor");
 		foreach ($mentors as $recordId => $mentor) {
 			if ($mentor) {
-                $regex = "/\s*;\s*/";
+                $regex = "/\s*[;\/]\s*/";
                 if (preg_match("/[A-Za-z\.]+\s+[A-Za-z\.]+\s*,\s*[A-Za-z\.]+\s+[A-Za-z\.]+/", $mentor)) {
                     # separating two names - not last name, first name
-                    $regex = "/\s*[;,]\s*/";
+                    $regex = "/\s*[;,\/]\s*/";
                 }
 				$recordMentors = preg_split($regex, $mentor);
 				$prettyRecordMentors = array();
 				foreach ($recordMentors as $recordMentor) {
                     $recordMentor = NameMatcher::pretty($recordMentor);
-					array_push($prettyRecordMentors, $recordMentor);
+					$prettyRecordMentors[] = $recordMentor;
 				}
 				$mentors[$recordId] = $prettyRecordMentors;
 			} else {
@@ -548,6 +548,16 @@ public static function fileAsBase64($pid, $field, $recordId, $instance = 1) {
         return "";
     }
 
+    public static function getDataByPid($pid, $fields, $records) {
+        if (REDCapManagement::versionGreaterThanOrEqualTo(REDCAP_VERSION, "12.5.2")) {
+            return \REDCap::getData($pid, "json-array", $records, $fields);
+        } else {
+            $json = \REDCap::getData($pid, "json", $records, $fields);
+            return json_decode($json, true);
+        }
+
+    }
+
 	private static function sendToServer($server, $data, $try = 1) {
 	    $maxTries = 5;
 	    if ($try > $maxTries) {
@@ -579,16 +589,15 @@ private static function sendToServer($server, $data, $try = 1) {
                 }
                 Application::log("sendToServer: ".$pid." REDCap::getData $numFields fields $numRecords records", $pid);
             }
+            $redcapData = self::getDataByPid($pid, $fields, $records);
             if (REDCapManagement::versionGreaterThanOrEqualTo(REDCAP_VERSION, "12.5.2")) {
                 $output = "Done";    // to turn off retry
-                $redcapData = \REDCap::getData($pid, "json-array", $records, $fields);
                 $resp = "getData-array";
                 $method = "getData-array";
             } else {
-                $output = \REDCap::getData($pid, "json", $records, $fields);
+                $output = json_encode($redcapData);
                 $resp = "getData";
                 $method = "getData";
-                $redcapData = json_decode($output, true);
             }
             if (isset($_GET['test'])) {
                 Application::log("sendToServer: ".$pid." $method done with ".count($redcapData)." rows", $pid);
@@ -1267,7 +1276,12 @@ public static function fieldsForRecordAndInstances($token, $server, $fields, $re
             if ($hasInstanceNull) {
                 $nullInstanceStr = "instance IS NULL or";
             }
-            $query->add("and ($nullInstanceStr instance IN (".implode(",", $questionMarks)."))", $modifiedInstances);
+            if (!empty($questionMarks)) {
+                $query->add("and ($nullInstanceStr instance IN (".implode(",", $questionMarks)."))", $modifiedInstances);
+            } else {
+                $query->add("and (instance IS NULL)", $modifiedInstances);
+            }
+
             $questionMarks = [];
             while (count($questionMarks) < count($fields)) {
                 $questionMarks[] = "?";
diff --git a/classes/EmailManager.php b/classes/EmailManager.php
index ff5fcc0b..70353010 100644
--- a/classes/EmailManager.php
+++ b/classes/EmailManager.php
@@ -257,7 +257,10 @@ private function enqueueRelevantEmails($to = "", $names = array(), $func = "send
                                     Application::log("Sending $name scheduled at ".date("Y-m-d H:i", $ts), $this->pid);
                                 }
                                 $result = $this->$func($emailSetting, $name, $type);
-							    $sentEmails[$name] = time();
+                                if (!Application::isLocalhost()) {
+                                    Application::log("Sent to $name scheduled at ".date("Y-m-d H:i", $ts), $this->pid);
+                                }
+                                $sentEmails[$name] = time();
 							} else if ($this->isReadyToSend($ts - $this->preparingMins * $oneMinute, $currTimes)) {
                                 $this->sendPreviewEmail($emailSetting, $name);
                             }
@@ -274,19 +277,17 @@ private function enqueueRelevantEmails($to = "", $names = array(), $func = "send
 				}
 			}
 		}
-        if (Application::isVanderbilt()) {
-            # log notes will break on localhost because $_GET['test'] is enabled for verbose output
-            $format = "Y-m-d H:i";
-            foreach ($sentEmails as $sendName => $ts) {
-                if (!Application::isLocalhost()) {
-                    Application::log("$logHeader: $sendName sent at ".date($format, $ts).".", $this->pid);
-                }
+        # log notes will break on localhost because $_GET['test'] is enabled for verbose output
+        $format = "Y-m-d H:i";
+        foreach ($sentEmails as $sendName => $ts) {
+            if (!Application::isLocalhost()) {
+                Application::log("$logHeader: $sendName sent at ".date($format, $ts).".", $this->pid);
             }
-            if (!empty($sentEmails)) {
-                foreach ($currTimes as $currTime) {
-                    if (!Application::isLocalhost()) {
-                        Application::log("$logHeader: Sending emails for " . date($format, (int)$currTime) . "; process spawned at " . date($format, $_SERVER['REQUEST_TIME'] ?? 0), $this->pid);
-                    }
+        }
+        if (!empty($sentEmails)) {
+            foreach ($currTimes as $currTime) {
+                if (!Application::isLocalhost()) {
+                    Application::log("$logHeader: Sending emails for " . date($format, (int)$currTime) . "; process spawned at " . date($format, $_SERVER['REQUEST_TIME'] ?? 0), $this->pid);
                 }
             }
         }
@@ -418,7 +419,9 @@ public function getSelectForExistingNames($elemName, $settingName = "") {
 
 	# returns records of emails
 	private function sendEmail($emailSetting, $settingName, $whenType, $toField = "who") {
+        Application::log("Preparing Email to ".$emailSetting["who"], $this->pid);
 		$emailData = $this->prepareEmail($emailSetting, $settingName, $whenType, $toField);
+        Application::log("Prepared ".count($emailData)." Emails", $this->pid);
 		if (!empty($emailData)) {
 			return $this->sendPreparedEmail($emailData, ($toField != "who"));
 		}
@@ -446,6 +449,7 @@ public function disable($name) {
 
 	# returns records of emails
 	private function sendPreparedEmail($emailData, $isTest = FALSE) {
+        Application::log("sendPrepared ".count($emailData)." emails: ".($isTest ? "TEST" : "REAL"), $this->pid);
 		$name = $emailData["name"];
 		$mssgs = $emailData["mssgs"];
 		$to = $emailData["to"];
diff --git a/classes/Portal.php b/classes/Portal.php
index 108f6bea..eec99406 100644
--- a/classes/Portal.php
+++ b/classes/Portal.php
@@ -8,6 +8,7 @@
 
 
 class Portal {
+    const NONE = "NONE";
 
     public static function getCurrentUserIDAndName() {
         $version = Application::getVersion();
@@ -185,7 +186,7 @@ public static function getMenu() {
             "action" => "honors",
             "title" => "Honors &amp; Awards",     // new survey
         ];
-        // TODO ORCID Bio Link
+        // TODO ORCID Bio Link in Your Info
 
         // TODO encouraging message if pubs are blank
         $menu["Your Graphs"][] = [
@@ -194,11 +195,11 @@ public static function getMenu() {
         ];
         $menu["Your Graphs"][] = [
             "action" => "pubs_impact",
-            "title" => "Your Publishing Impact",      // combined & deduped RCR graph; Altmetric summary & links
+            "title" => "Publishing Impact",      // combined & deduped RCR graph; Altmetric summary & links
         ];
         $menu["Your Graphs"][] = [
             "action" => "timelines",
-            "title" => "Your Grant Timelines",     // CDAs & all grants; encouraging message if blank
+            "title" => "Grant &amp; Publication Timelines",     // Pubs & all grants; encouraging message if blank
         ];
 //         $menu["Your Graphs"][] = [
 //            "action" => "group_collaborations",
@@ -206,13 +207,24 @@ public static function getMenu() {
 //        ];
 
         $menu["Your Network"][] = [
-            "action" => "mma",
+            "action" => "mentoring",
             "title" => "Mentoring Portal",             // set up mentor(s); fill out MMAs; talk to each other
         ];
         if (Application::isVanderbilt()) {
             $menu["Your Network"][] = [
                 "action" => "connect",
-                "title" => "Connect",     // flight connector
+                "title" => "Connect With Colleagues",     // flight connector
+            ];
+
+            $menu["Your Network"][] = [
+                "action" => "resources",
+                "title" => "Resource Map",     // flight map
+            ];
+
+            # Newman Society success figures: externally launch career_dev/newmanFigures
+            $menu["Your Network"][] = [
+                "action" => "stats",
+                "title" => "Newman Society Statistics",
             ];
         }
         $menu["Your Network"][] = [
@@ -231,4 +243,129 @@ public static function getHeaders() {
         $html .= Application::getImportHTML();
         return $html;
     }
-}
\ No newline at end of file
+
+    public static function makeMentoringPortal($pid, $recordId, $projectTitle, $driverURL) {
+        $redcapData = Download::getDataByPid($pid, ["record_id", "summary_mentor", "summary_mentor_userid"], [$recordId]);
+        $mentorList = REDCapManagement::findField($redcapData, $recordId, "summary_mentor");
+        $mentorUseridList = REDCapManagement::findField($redcapData, $recordId, "summary_mentor_userid");
+        $mentors = $mentorList ? preg_split("/\s*[,;\/]\s*/", $mentorList) : [];
+        $mentorUserids = $mentorUseridList ? preg_split("/\s*[,;]\s*/", $mentorUseridList) : [];
+
+        $mssg = "<p class='centered max-width'>Your do not have a mentor set up. Would you like to add one?</p>";
+        $html = "<h3>Your Mentoring Portal for $projectTitle</h3>";
+        $html .= "<div id='searchResults'></div>";
+        if (Application::isMSTP($pid)) {
+            $html .= "<h4>Coming Soon</h4>";
+        } else if (empty($mentors) && empty($mentorUserids)) {
+            $html .= self::makeMentorSetup($driverURL, $pid, $recordId, $mssg);
+        } else if (empty($mentorUserids)) {
+            $i = 1;
+            foreach ($mentors as $mentorName) {
+                list($firstName, $lastName) = NameMatcher::splitName($mentorName, 2);
+                $lookup = new REDCapLookup($firstName, $lastName);
+                $uidsAndNames = $lookup->getUidsAndNames(TRUE);
+                $html .= self::processUidsAndNames($driverURL, $mentorName, $pid, $recordId, $uidsAndNames, $i, "<p class='centered max-width'>This mentor has no matches. Would you like to add one?</p>");
+                $i++;
+            }
+        } else if (empty($mentors)) {
+            # User ID but no name; This should not happen without a configuration error
+            $mentorNames = [];
+            foreach ($mentorUserids as $mentorUserid) {
+                $info = REDCapLookup::getUserInfo($mentorUserid);
+                if (!empty($info)) {
+                    $mentorNames[] = $info['user_firstname']." ".$info['user_lastname'];
+                }
+            }
+            if (!empty($mentorNames)) {
+                $mentors = $mentorNames;
+                $mentorList = implode(", ", $mentors);
+                $uploadRow = ["record_id" => $recordId, "summary_mentor" => $mentorList];
+                Upload::rowsByPid([$uploadRow], $pid);
+                $html .= self::makeLiveMentorPortal($mentors, $mentorUserids, $pid, $projectTitle);
+            } else {
+                $html .= self::makeMentorSetup($driverURL, $pid, $recordId, $mssg);
+            }
+        } else {
+            $html .= self::makeLiveMentorPortal($mentors, $mentorUserids, $pid, $projectTitle);
+        }
+        return $html;
+    }
+
+    public static function processUidsAndNames($driverURL, $mentorName, $pid, $recordId, $uidsAndNames, $i, $priorMessage = "") {
+        $html = "<h4>$mentorName</h4>";
+        if (empty($uidsAndNames)) {
+            $html .= self::makeMentorSetup($driverURL, $pid, $recordId, $priorMessage, $i);
+        } else {
+            $html .= self::makeConfirmationTable($driverURL, $mentorName, $pid, $recordId, $uidsAndNames, $i);
+        }
+        return $html;
+    }
+
+    private static function makeConfirmationTable($url, $mentorName, $pid, $recordId, $uidsAndNames, $index) {
+        $html = "<table class='centered max-width'><tbody>";
+        if (count($uidsAndNames) == 1) {
+            $radioName = "mentor_$index"."_yn";
+            $html .= "<tr>";
+            foreach ($uidsAndNames as $uid => $name) {
+                $html .= "<td>User-id: $uid ($name)</td>";
+                $html .= "<td>Is this the correct user?";
+                $html .= "<br/><input type='radio' name='$radioName' id='mentor_$index"."_yes' value='1' /> <label for='mentor_$index"."_yes'>Yes</label>";
+                $html .= "<br/><input type='radio' name='$radioName' id='mentor_$index"."_no' value='0' /> <label for='mentor_$index"."_no'>No</label>";
+                $html .= "</td>";
+            }
+            $html .= "</tr>";
+        } else {
+            $radioName = "mentor_$index"."_multi";
+            $html .= "<tr>";
+            $html .= "<td style='max-width: 200px;'>Which of these are mentor $mentorName?</td>";
+            $html .= "<td style='text-align: left;'>";
+            $lines = [];
+            $lines[] = "<input type='radio' name='$radioName' id='mentor_$index"."_".self::NONE."' value='".self::NONE."' /> <label for='mentor_$index"."_".self::NONE."'>None of the below</label>";
+            foreach ($uidsAndNames as $uid => $name) {
+                $lines[] = "<input type='radio' name='$radioName' id='mentor_$index"."_$uid' value='$uid' /> <label for='mentor_$index"."_$uid'>$uid ($name)</label>";
+            }
+            $html .= implode("<br/>", $lines);
+            $html .= "</td>";
+            $html .= "</tr>";
+        }
+        $html .= "</tbody></table>";
+        $html .= "<p class='centered max-width'><button onclick='portal.selectMentors(\"$url\", \"$pid\", \"$recordId\", \"$mentorName\", \"[name=$radioName]\"); return false;'>Make Selection</button></p>";
+        return $html;
+    }
+
+    private static function makeMentorSetup($url, $pid, $recordId, $priorMessage = "", $index = NULL) {
+        $suffix = isset($index) ? "_".$index : "";
+        $html = "";
+        if ($priorMessage) {
+            $html .= $priorMessage;
+        }
+        $html .= "<p class='centered max-width'><input type='text' id='mentor$suffix' name='mentor$suffix' placeholder='Mentor Name' /></p>";
+
+        $lines = [];
+        $lines[] = "<button onclick='portal.searchForMentor(\"$url\", \"$pid\", \"$recordId\", \"#mentor$suffix\"); return false;'>Search If They Have REDCap Access</button>";
+        $lines[] = "";
+        $lines[] = "<strong>-OR-</strong>";
+        $lines[] = "";
+        $lines[] = "<label for='mentor_userid$suffix'>Input the Mentor's User ID for Accessing REDCap</label>";
+        $lines[] = "<input type='text' id='mentor_userid$suffix' name='mentor_userid$suffix' placeholder=\"Mentor's User ID\" />";
+        $lines[] = "<button onclick='portal.submitNameAndUserid(\"$url\", \"$pid\", \"$recordId\", \"#mentor$suffix\", \"#mentor_userid$suffix\"); return false;'>Submit Name &amp; User ID</button>";
+
+        $html .= "<p class='centered max-width'>".implode("<br/>", $lines)."</p>";
+        return $html;
+    }
+
+    private static function makeLiveMentorPortal($mentors, $mentorUserids, $pid, $projectTitle) {
+        $html = "<p class='centered max-width'>";
+        if (count($mentors) == 1) {
+            $mentorUseridList = implode(", ", $mentorUserids);
+            $html .= "Your mentor is {$mentors[0]}, and they have access to REDCap through the user-id $mentorUseridList.";
+        } else {
+            $html .= "Your mentors are ".REDCapManagement::makeConjunction($mentors).". The following user-id(s) provide them access: ".REDCapManagement::makeConjunction($mentorUserids).".";
+        }
+        $html .= "</p>";
+
+        $mmaURL = Application::getMenteeAgreementLink($pid);
+        $html .= "<h4>".Links::makeLink($mmaURL, "Access Your Mentee-Mentor Agreement for $projectTitle", TRUE)."</h4>";
+        return $html;
+    }
+}
diff --git a/classes/Publications.php b/classes/Publications.php
index 7a4ca276..f1042479 100644
--- a/classes/Publications.php
+++ b/classes/Publications.php
@@ -177,13 +177,20 @@ public static function filterExcludeList($rows, $recordExcludeList) {
 	    return $newRows;
     }
 
-    public static function searchPubMedForName($first, $last, $pid, $institution = "") {
+    public static function searchPubMedForName($first, $last, $pid, $institutions = []) {
+        if (!is_array($institutions)) {
+            $institutions = [$institutions];
+        }
         $first = preg_replace("/\s+/", "+", $first);
         $last = preg_replace("/\s+/", "+", $last);
-        $institution = preg_replace("/\s+/", "+", $institution);
         $term = $first."+".$last."%5Bau%5D";
-        if ($institution) {
-            $term .= "+AND+" . Sanitizer::repetitivelyDecodeHTML(strtolower($institution)) . "%5Bad%5D";
+        $institutionSearchNodes = [];
+        foreach ($institutions as $institution) {
+            $institution = preg_replace("/\s+/", "+", $institution);
+            $institutionSearchNodes[] = Sanitizer::repetitivelyDecodeHTML(strtolower($institution)) . "+%5Bad%5D";
+        }
+        if (!empty($institutionSearchNodes)) {
+            $term .= "AND (".implode("+OR+", $institutionSearchNodes).")";
         }
         $pmids = self::queryPubMed($term, $pid);
 
@@ -1448,15 +1455,11 @@ public static function deleteMiddleNameOnlyMatches($token, $server, $pid, $recor
             $pmidsMatchedByFirst = [];
             foreach ($lastNames as $lastName) {
                 foreach ($firstNames as $firstName) {
-                    foreach ($institutions as $institution) {
-                        if ($institution) {
-                            if (isset($middleName) && $middleName) {
-                                $firstName .= " ".$middleName;
-                            }
-                            $currPMIDs = Publications::searchPubMedForName($firstName, $lastName, $pid, $institution);
-                            $pmidsMatchedByFirst = array_unique(array_merge($pmidsMatchedByFirst, $currPMIDs));
-                        }
+                    if (isset($middleName) && $middleName) {
+                        $firstName .= " ".$middleName;
                     }
+                    $currPMIDs = Publications::searchPubMedForName($firstName, $lastName, $pid, $institutions);
+                    $pmidsMatchedByFirst = array_unique(array_merge($pmidsMatchedByFirst, $currPMIDs));
                 }
             }
 
@@ -1464,12 +1467,8 @@ public static function deleteMiddleNameOnlyMatches($token, $server, $pid, $recor
             $pmidsMatchedByMiddle = [];
             foreach ($lastNames as $lastName) {
                 foreach ($candidateNames as $candidateName) {
-                    foreach ($institutions as $institution) {
-                        if ($institution) {
-                            $currPMIDs = Publications::searchPubMedForName($candidateName, $lastName, $pid, $institution);
-                            $pmidsMatchedByMiddle = array_unique(array_merge($pmidsMatchedByMiddle, $currPMIDs));
-                        }
-                    }
+                    $currPMIDs = Publications::searchPubMedForName($candidateName, $lastName, $pid, $institutions);
+                    $pmidsMatchedByMiddle = array_unique(array_merge($pmidsMatchedByMiddle, $currPMIDs));
                 }
             }
 
diff --git a/classes/REDCapLookup.php b/classes/REDCapLookup.php
index be2404d2..8ca3b9a2 100644
--- a/classes/REDCapLookup.php
+++ b/classes/REDCapLookup.php
@@ -36,14 +36,10 @@ public function getName() {
 
     public function getUidsAndNames($showEmails = FALSE) {
         $uids = [];
-        if ($showEmails) {
-            $sqlField = ", user_email";
-        } else {
-            $sqlField = "";
-        }
+        $sqlField = $showEmails ? "user_email" : "";
+        $clause = $showEmails ? ", ".$sqlField : "";
 
         $module = Application::getModule();
-        $params = [];
         if (!$this->firstName || !$this->lastName) {
             if (!$this->firstName) {
                 $name = $this->lastName;
@@ -51,14 +47,14 @@ public function getUidsAndNames($showEmails = FALSE) {
                 $name = $this->firstName;
             }
             $params = [strtolower($name), strtolower($name)];
-            $sql = "SELECT username, user_firstname, user_lastname $sqlField FROM redcap_user_information WHERE lower(user_firstname) = ? OR lower(user_lastname) = ?";
+            $sql = "SELECT username, user_firstname, user_lastname$clause FROM redcap_user_information WHERE lower(user_firstname) = ? OR lower(user_lastname) = ?";
         } else {
             $firstNames = NameMatcher::explodeFirstName($this->firstName);
             if (count($firstNames) > 1) {
                 foreach ($firstNames as $firstName) {
                     if ($firstName && !NameMatcher::isInitial($firstName)) {
                         $params2 = [strtolower($this->firstName), strtolower($this->lastName)];
-                        $sql2 = "SELECT username, user_firstname, user_lastname $sqlField FROM redcap_user_information WHERE lower(user_firstname) = ? AND lower(user_lastname) = ?";
+                        $sql2 = "SELECT username, user_firstname, user_lastname$clause FROM redcap_user_information WHERE lower(user_firstname) = ? AND lower(user_lastname) = ?";
                         $results2 = $module->query($sql2, $params2);
                         while ($row2 = $results2->fetch_assoc()) {
                             if ($row2['username']) {
@@ -74,7 +70,7 @@ public function getUidsAndNames($showEmails = FALSE) {
                 return $uids;
             } else {
                 $params = [strtolower($this->firstName), strtolower($this->lastName)];
-                $sql = "SELECT username, user_firstname, user_lastname $sqlField FROM redcap_user_information WHERE lower(user_firstname) = ? AND lower(user_lastname) = ?";
+                $sql = "SELECT username, user_firstname, user_lastname$clause FROM redcap_user_information WHERE lower(user_firstname) = ? AND lower(user_lastname) = ?";
             }
         }
         $results = $module->query($sql, $params);
@@ -86,6 +82,9 @@ public function getUidsAndNames($showEmails = FALSE) {
                 }
             }
         }
+        foreach ($uids as $uid => $name) {
+            $uids[$uid] = trim($name);
+        }
         ksort($uids);
         return $uids;
     }
diff --git a/classes/Scholar.php b/classes/Scholar.php
index b9d54509..5835ccc4 100644
--- a/classes/Scholar.php
+++ b/classes/Scholar.php
@@ -441,7 +441,7 @@ private function getGenericValueForField($rows, $field, $byLatest = FALSE, $show
     }
 
     public function isMSTP() {
-        return Application::isVanderbilt() && ($this->pid == 149668);
+        return Application::isMSTP($this->pid);
     }
 
     private function searchForAndTranslateSpecialResults($rows, $field) {
diff --git a/classes/SocialNetworkChart.php b/classes/SocialNetworkChart.php
index 9f6af3fa..1fcc18b8 100644
--- a/classes/SocialNetworkChart.php
+++ b/classes/SocialNetworkChart.php
@@ -5,9 +5,10 @@
 require_once(__DIR__ . '/ClassLoader.php');
 
 class SocialNetworkChart extends Chart {
-    public function __construct($name, $chartData) {
+    public function __construct($name, $chartData, $pid = "") {
         $this->chartData = $chartData;
         $this->name = $name;
+        $this->pid = $pid;
     }
 
     public function setNonRibbon($bool) {
@@ -67,6 +68,7 @@ public function getHTML($width, $height, $showLabels = TRUE, $legendInfo = [], $
     $(document).ready(function() {
         am4core.useTheme(am4themes_animated);
         const chart = am4core.create('{$this->name}', am4charts.ChordDiagram);
+        window['chartReg_{$this->pid}'] = chart;
         chart.colors.saturation = 0.45;
         chart.colors.step = 3;
         const colors = {};
@@ -212,6 +214,7 @@ public function getHTML($width, $height, $showLabels = TRUE, $legendInfo = [], $
         return $html;
     }
 
+    protected $pid = "";
     protected $name = "";
     protected $chartData = [];
     protected $isNonRibbon = FALSE;
diff --git a/classes/Upload.php b/classes/Upload.php
index a4571578..b4bfc3af 100644
--- a/classes/Upload.php
+++ b/classes/Upload.php
@@ -288,7 +288,44 @@ public static function deleteRecords($token, $server, $records) {
         return array();
     }
 
-public static function metadata($metadata, $token, $server) {
+    // avoids design rights and development mode issues
+    public static function metadataNoAPI($metadata, $pid) {
+        if (!is_array($metadata)) {
+            Application::log("Upload::metadataNoAPI: first parameter should be array", $pid);
+            die();
+        }
+        if (!Sanitizer::sanitizePid($pid)) {
+            throw new \Exception("Invalid pid");
+        }
+
+        require_once(APP_PATH_DOCROOT."Classes/MetaData.php");
+        require_once(APP_PATH_DOCROOT."Classes/Logging.php");
+
+        self::adaptToUTF8($metadata);
+
+        // Save a flat item-based metadata array
+        $dd_array = \MetaData::convertFlatMetadataToDDarray($metadata);
+        list ($errors, $warnings, $dd_array) = \MetaData::error_checking($dd_array, FALSE, FALSE);
+        if (!empty($errors)) {
+            throw new \Exception("Input errors: ".strip_tags(implode("\n", $errors)));
+        }
+
+        $errors = \MetaData::save_metadata($dd_array, FALSE, TRUE, $pid);
+        $count = count($dd_array['A']);
+
+        // Return any errors found when attempting to commit
+        if (!empty($errors)) {
+            throw new \Exception("Upload errors: ".strip_tags(implode("\n", $errors)));
+        } else {
+            \MetaData::createDataDictionarySnapshot();
+            \Logging::logEvent("", "redcap_metadata", "MANAGE", $pid, "project_id = " . $pid, "Upload data dictionary");
+
+            return $count;
+        }
+
+    }
+
+    public static function metadata($metadata, $token, $server) {
 		self::adaptToUTF8($metadata);
 		if (!is_array($metadata)) {
 			Application::log("Upload::metadata: first parameter should be array");
@@ -303,6 +340,9 @@ public static function metadata($metadata, $token, $server) {
         }
 
         $pid = Application::getPID($token);
+        if ($pid) {
+            return self::metadataNoAPI($metadata, $pid);
+        }
         if (REDCapManagement::isInProduction($pid)) {
             REDCapManagement::setToDevelopment($pid);
         }
@@ -428,11 +468,34 @@ public static function file($pid, $record, $field, $originalBase64, $filename, $
             return ["error" => "Could not decode base64"];
         }
     }
+
+    public static function projectSettingsNotAPI($settings, $pid) {
+        require_once(APP_PATH_DOCROOT."Classes/Project.php");
+        require_once(APP_PATH_DOCROOT."Classes/Logging.php");
+
+        $Proj = new \Project($pid);
+        \Logging::logEvent("", "redcap_projects", "MANAGE", $pid, "project_id = " . $pid, "Import project information");
+
+        $project_fields = \Project::getAttributesApiExportProjectInfo();
+        foreach ($project_fields as $key => $hdr)
+        {
+            if (isset($settings[$hdr]))
+            {
+                $Proj->project[$key] = $settings[$hdr];
+            }
+        }
+        $Proj->setProjectValues();
+        return count($settings);
+    }
+
 	public static function projectSettings($settings, $token, $server) {
 		if (!$token || !$server) {
 			throw new \Exception("No token or server supplied!");
 		}
         $pid = Application::getPID($token);
+        if ($pid) {
+            return self::projectSettingsNotAPI($settings, $pid);
+        }
         $server = Sanitizer::sanitizeURL($server);
         if (!$server) {
             throw new \Exception("Invalid URL");
diff --git a/clean/clearBatchQueue.php b/clean/clearBatchQueue.php
index 00a38d46..073cfdbb 100644
--- a/clean/clearBatchQueue.php
+++ b/clean/clearBatchQueue.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use \Vanderbilt\CareerDevLibrary\CronManager;
 use \Vanderbilt\CareerDevLibrary\Application;
 
@@ -9,4 +8,4 @@
 
 $module = Application::getModule();
 CronManager::clearBatchQueue($module);
-echo "Done.";
+echo "Done.";
\ No newline at end of file
diff --git a/css/career_dev.css b/css/career_dev.css
index a7ef3f5c..da71b26d 100644
--- a/css/career_dev.css
+++ b/css/career_dev.css
@@ -200,4 +200,3 @@ div.scrollable { width: 100%; max-height: 75px; margin: 0; padding: 0; overflow:
 .Unfunded { border-color: #888888 !important; }
 .Pending { border-color: #8dc63f !important; }
 .Awarded { border-color: #f4c3ff !important; }
-.portalDescription { background-color: #b0d87a; padding: 4px; text-align: center; max-width: 600px; margin: 8px auto; }
\ No newline at end of file
diff --git a/js/base.js b/js/base.js
index 5a2306a7..420b077d 100644
--- a/js/base.js
+++ b/js/base.js
@@ -28,6 +28,18 @@ function togglePubMedName(nameSelector, ob, checkedImg, uncheckedImg) {
 	}
 }
 
+function downloadCanvas(canvas, filename) {
+	if (filename.match(/\.png$/i)) {
+		const imageData = canvas2PNG(canvas);
+		forceDownloadUrl(imageData, filename);
+	} else if (filename.match(/\.jpg$/) || filename.match(/\.jpeg/)) {
+		const imageData = canvas2JPEG(canvas);
+		forceDownloadUrl(imageData, filename);
+	} else {
+		console.error("Invalid file type");
+	}
+}
+
 function turnOffStatusCron() {
 	$.post(getPageUrl("testConnectivity.php"), { 'redcap_csrf_token': getCSRFToken(), turn_off: 1 }, function(html) {
 		console.log("Turned off "+html);
diff --git a/js/html2canvas.min.js b/js/html2canvas.min.js
new file mode 100644
index 00000000..2ea032de
--- /dev/null
+++ b/js/html2canvas.min.js
@@ -0,0 +1,8 @@
+/*
+  html2canvas 0.4.1 <http://html2canvas.hertzen.com>
+  Copyright (c) 2013 Niklas von Hertzen
+
+  Released under MIT License
+*/
+(function(t,e,n){"use strict";function r(t,e,n){var r,a=t.runtimeStyle&&t.runtimeStyle[e],o=t.style;return!/^-?[0-9]+\.?[0-9]*(?:px)?$/i.test(n)&&/^-?\d/.test(n)&&(r=o.left,a&&(t.runtimeStyle.left=t.currentStyle.left),o.left="fontSize"===e?"1em":n||0,n=o.pixelLeft+"px",o.left=r,a&&(t.runtimeStyle.left=a)),/^(thin|medium|thick)$/i.test(n)?n:Math.round(parseFloat(n))+"px"}function a(t){return parseInt(t,10)}function o(t,e,a,o){if(t=(t||"").split(","),t=t[o||0]||t[0]||"auto",t=u.Util.trimText(t).split(" "),"backgroundSize"!==a||t[0]&&!t[0].match(/cover|contain|auto/)){if(t[0]=-1===t[0].indexOf("%")?r(e,a+"X",t[0]):t[0],t[1]===n){if("backgroundSize"===a)return t[1]="auto",t;t[1]=t[0]}t[1]=-1===t[1].indexOf("%")?r(e,a+"Y",t[1]):t[1]}else;return t}function i(t,e,n,r,a,o){var i,l,s,c,d=u.Util.getCSS(e,t,a);if(1===d.length&&(c=d[0],d=[],d[0]=c,d[1]=c),-1!==(""+d[0]).indexOf("%"))s=parseFloat(d[0])/100,l=n.width*s,"backgroundSize"!==t&&(l-=(o||r).width*s);else if("backgroundSize"===t)if("auto"===d[0])l=r.width;else if(/contain|cover/.test(d[0])){var h=u.Util.resizeBounds(r.width,r.height,n.width,n.height,d[0]);l=h.width,i=h.height}else l=parseInt(d[0],10);else l=parseInt(d[0],10);return"auto"===d[1]?i=l/r.width*r.height:-1!==(""+d[1]).indexOf("%")?(s=parseFloat(d[1])/100,i=n.height*s,"backgroundSize"!==t&&(i-=(o||r).height*s)):i=parseInt(d[1],10),[l,i]}function l(t,e){var n=[];return{storage:n,width:t,height:e,clip:function(){n.push({type:"function",name:"clip",arguments:arguments})},translate:function(){n.push({type:"function",name:"translate",arguments:arguments})},fill:function(){n.push({type:"function",name:"fill",arguments:arguments})},save:function(){n.push({type:"function",name:"save",arguments:arguments})},restore:function(){n.push({type:"function",name:"restore",arguments:arguments})},fillRect:function(){n.push({type:"function",name:"fillRect",arguments:arguments})},createPattern:function(){n.push({type:"function",name:"createPattern",arguments:arguments})},drawShape:function(){var t=[];return n.push({type:"function",name:"drawShape",arguments:t}),{moveTo:function(){t.push({name:"moveTo",arguments:arguments})},lineTo:function(){t.push({name:"lineTo",arguments:arguments})},arcTo:function(){t.push({name:"arcTo",arguments:arguments})},bezierCurveTo:function(){t.push({name:"bezierCurveTo",arguments:arguments})},quadraticCurveTo:function(){t.push({name:"quadraticCurveTo",arguments:arguments})}}},drawImage:function(){n.push({type:"function",name:"drawImage",arguments:arguments})},fillText:function(){n.push({type:"function",name:"fillText",arguments:arguments})},setVariable:function(t,e){return n.push({type:"variable",name:t,arguments:e}),e}}}function s(t){return{zindex:t,children:[]}}var c,d,u={};u.Util={},u.Util.log=function(e){u.logging&&t.console&&t.console.log&&t.console.log(e)},u.Util.trimText=function(t){return function(e){return t?t.apply(e):((e||"")+"").replace(/^\s+|\s+$/g,"")}}(String.prototype.trim),u.Util.asFloat=function(t){return parseFloat(t)},function(){var t=/((rgba|rgb)\([^\)]+\)(\s-?\d+px){0,})/g,e=/(-?\d+px)|(#.+)|(rgb\(.+\))|(rgba\(.+\))/g;u.Util.parseTextShadows=function(n){if(!n||"none"===n)return[];for(var r=n.match(t),a=[],o=0;r&&r.length>o;o++){var i=r[o].match(e);a.push({color:i[0],offsetX:i[1]?i[1].replace("px",""):0,offsetY:i[2]?i[2].replace("px",""):0,blur:i[3]?i[3].replace("px",""):0})}return a}}(),u.Util.parseBackgroundImage=function(t){var e,n,r,a,o,i,l,s,c=" \r\n	",d=[],u=0,h=0,f=function(){e&&('"'===n.substr(0,1)&&(n=n.substr(1,n.length-2)),n&&s.push(n),"-"===e.substr(0,1)&&(a=e.indexOf("-",1)+1)>0&&(r=e.substr(0,a),e=e.substr(a)),d.push({prefix:r,method:e.toLowerCase(),value:o,args:s})),s=[],e=r=n=o=""};f();for(var p=0,g=t.length;g>p;p++)if(i=t[p],!(0===u&&c.indexOf(i)>-1)){switch(i){case'"':l?l===i&&(l=null):l=i;break;case"(":if(l)break;if(0===u){u=1,o+=i;continue}h++;break;case")":if(l)break;if(1===u){if(0===h){u=0,o+=i,f();continue}h--}break;case",":if(l)break;if(0===u){f();continue}if(1===u&&0===h&&!e.match(/^url$/i)){s.push(n),n="",o+=i;continue}}o+=i,0===u?e+=i:n+=i}return f(),d},u.Util.Bounds=function(t){var e,n={};return t.getBoundingClientRect&&(e=t.getBoundingClientRect(),n.top=e.top,n.bottom=e.bottom||e.top+e.height,n.left=e.left,n.width=t.offsetWidth,n.height=t.offsetHeight),n},u.Util.OffsetBounds=function(t){var e=t.offsetParent?u.Util.OffsetBounds(t.offsetParent):{top:0,left:0};return{top:t.offsetTop+e.top,bottom:t.offsetTop+t.offsetHeight+e.top,left:t.offsetLeft+e.left,width:t.offsetWidth,height:t.offsetHeight}},u.Util.getCSS=function(t,n,r){c!==t&&(d=e.defaultView.getComputedStyle(t,null));var i=d[n];if(/^background(Size|Position)$/.test(n))return o(i,t,n,r);if(/border(Top|Bottom)(Left|Right)Radius/.test(n)){var l=i.split(" ");return 1>=l.length&&(l[1]=l[0]),l.map(a)}return i},u.Util.resizeBounds=function(t,e,n,r,a){var o,i,l=n/r,s=t/e;return a&&"auto"!==a?s>l^"contain"===a?(i=r,o=r*s):(o=n,i=n/s):(o=n,i=r),{width:o,height:i}},u.Util.BackgroundPosition=function(t,e,n,r,a){var o=i("backgroundPosition",t,e,n,r,a);return{left:o[0],top:o[1]}},u.Util.BackgroundSize=function(t,e,n,r){var a=i("backgroundSize",t,e,n,r);return{width:a[0],height:a[1]}},u.Util.Extend=function(t,e){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},u.Util.Children=function(t){var e;try{e=t.nodeName&&"IFRAME"===t.nodeName.toUpperCase()?t.contentDocument||t.contentWindow.document:function(t){var e=[];return null!==t&&function(t,e){var r=t.length,a=0;if("number"==typeof e.length)for(var o=e.length;o>a;a++)t[r++]=e[a];else for(;e[a]!==n;)t[r++]=e[a++];return t.length=r,t}(e,t),e}(t.childNodes)}catch(r){u.Util.log("html2canvas.Util.Children failed with exception: "+r.message),e=[]}return e},u.Util.isTransparent=function(t){return"transparent"===t||"rgba(0, 0, 0, 0)"===t},u.Util.Font=function(){var t={};return function(e,r,a){if(t[e+"-"+r]!==n)return t[e+"-"+r];var o,i,l,s=a.createElement("div"),c=a.createElement("img"),d=a.createElement("span"),u="Hidden Text";return s.style.visibility="hidden",s.style.fontFamily=e,s.style.fontSize=r,s.style.margin=0,s.style.padding=0,a.body.appendChild(s),c.src="data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACwAAAAAAQABAAACAkQBADs=",c.width=1,c.height=1,c.style.margin=0,c.style.padding=0,c.style.verticalAlign="baseline",d.style.fontFamily=e,d.style.fontSize=r,d.style.margin=0,d.style.padding=0,d.appendChild(a.createTextNode(u)),s.appendChild(d),s.appendChild(c),o=c.offsetTop-d.offsetTop+1,s.removeChild(d),s.appendChild(a.createTextNode(u)),s.style.lineHeight="normal",c.style.verticalAlign="super",i=c.offsetTop-s.offsetTop+1,l={baseline:o,lineWidth:1,middle:i},t[e+"-"+r]=l,a.body.removeChild(s),l}}(),function(){function t(t){return function(e){try{t.addColorStop(e.stop,e.color)}catch(r){n.log(["failed to add color stop: ",r,"; tried to add: ",e])}}}var n=u.Util,r={};u.Generate=r;var a=[/^(-webkit-linear-gradient)\(([a-z\s]+)([\w\d\.\s,%\(\)]+)\)$/,/^(-o-linear-gradient)\(([a-z\s]+)([\w\d\.\s,%\(\)]+)\)$/,/^(-webkit-gradient)\((linear|radial),\s((?:\d{1,3}%?)\s(?:\d{1,3}%?),\s(?:\d{1,3}%?)\s(?:\d{1,3}%?))([\w\d\.\s,%\(\)\-]+)\)$/,/^(-moz-linear-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?))([\w\d\.\s,%\(\)]+)\)$/,/^(-webkit-radial-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?)),\s(\w+)\s([a-z\-]+)([\w\d\.\s,%\(\)]+)\)$/,/^(-moz-radial-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?)),\s(\w+)\s?([a-z\-]*)([\w\d\.\s,%\(\)]+)\)$/,/^(-o-radial-gradient)\(((?:\d{1,3}%?)\s(?:\d{1,3}%?)),\s(\w+)\s([a-z\-]+)([\w\d\.\s,%\(\)]+)\)$/];r.parseGradient=function(t,e){var n,r,o,i,l,s,c,d,u,h,f,p,g=a.length;for(r=0;g>r&&!(o=t.match(a[r]));r+=1);if(o)switch(o[1]){case"-webkit-linear-gradient":case"-o-linear-gradient":if(n={type:"linear",x0:null,y0:null,x1:null,y1:null,colorStops:[]},l=o[2].match(/\w+/g))for(s=l.length,r=0;s>r;r+=1)switch(l[r]){case"top":n.y0=0,n.y1=e.height;break;case"right":n.x0=e.width,n.x1=0;break;case"bottom":n.y0=e.height,n.y1=0;break;case"left":n.x0=0,n.x1=e.width}if(null===n.x0&&null===n.x1&&(n.x0=n.x1=e.width/2),null===n.y0&&null===n.y1&&(n.y0=n.y1=e.height/2),l=o[3].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)(?:\s\d{1,3}(?:%|px))?)+/g))for(s=l.length,c=1/Math.max(s-1,1),r=0;s>r;r+=1)d=l[r].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\s*(\d{1,3})?(%|px)?/),d[2]?(i=parseFloat(d[2]),i/="%"===d[3]?100:e.width):i=r*c,n.colorStops.push({color:d[1],stop:i});break;case"-webkit-gradient":if(n={type:"radial"===o[2]?"circle":o[2],x0:0,y0:0,x1:0,y1:0,colorStops:[]},l=o[3].match(/(\d{1,3})%?\s(\d{1,3})%?,\s(\d{1,3})%?\s(\d{1,3})%?/),l&&(n.x0=l[1]*e.width/100,n.y0=l[2]*e.height/100,n.x1=l[3]*e.width/100,n.y1=l[4]*e.height/100),l=o[4].match(/((?:from|to|color-stop)\((?:[0-9\.]+,\s)?(?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)\))+/g))for(s=l.length,r=0;s>r;r+=1)d=l[r].match(/(from|to|color-stop)\(([0-9\.]+)?(?:,\s)?((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\)/),i=parseFloat(d[2]),"from"===d[1]&&(i=0),"to"===d[1]&&(i=1),n.colorStops.push({color:d[3],stop:i});break;case"-moz-linear-gradient":if(n={type:"linear",x0:0,y0:0,x1:0,y1:0,colorStops:[]},l=o[2].match(/(\d{1,3})%?\s(\d{1,3})%?/),l&&(n.x0=l[1]*e.width/100,n.y0=l[2]*e.height/100,n.x1=e.width-n.x0,n.y1=e.height-n.y0),l=o[3].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)(?:\s\d{1,3}%)?)+/g))for(s=l.length,c=1/Math.max(s-1,1),r=0;s>r;r+=1)d=l[r].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\s*(\d{1,3})?(%)?/),d[2]?(i=parseFloat(d[2]),d[3]&&(i/=100)):i=r*c,n.colorStops.push({color:d[1],stop:i});break;case"-webkit-radial-gradient":case"-moz-radial-gradient":case"-o-radial-gradient":if(n={type:"circle",x0:0,y0:0,x1:e.width,y1:e.height,cx:0,cy:0,rx:0,ry:0,colorStops:[]},l=o[2].match(/(\d{1,3})%?\s(\d{1,3})%?/),l&&(n.cx=l[1]*e.width/100,n.cy=l[2]*e.height/100),l=o[3].match(/\w+/),d=o[4].match(/[a-z\-]*/),l&&d)switch(d[0]){case"farthest-corner":case"cover":case"":u=Math.sqrt(Math.pow(n.cx,2)+Math.pow(n.cy,2)),h=Math.sqrt(Math.pow(n.cx,2)+Math.pow(n.y1-n.cy,2)),f=Math.sqrt(Math.pow(n.x1-n.cx,2)+Math.pow(n.y1-n.cy,2)),p=Math.sqrt(Math.pow(n.x1-n.cx,2)+Math.pow(n.cy,2)),n.rx=n.ry=Math.max(u,h,f,p);break;case"closest-corner":u=Math.sqrt(Math.pow(n.cx,2)+Math.pow(n.cy,2)),h=Math.sqrt(Math.pow(n.cx,2)+Math.pow(n.y1-n.cy,2)),f=Math.sqrt(Math.pow(n.x1-n.cx,2)+Math.pow(n.y1-n.cy,2)),p=Math.sqrt(Math.pow(n.x1-n.cx,2)+Math.pow(n.cy,2)),n.rx=n.ry=Math.min(u,h,f,p);break;case"farthest-side":"circle"===l[0]?n.rx=n.ry=Math.max(n.cx,n.cy,n.x1-n.cx,n.y1-n.cy):(n.type=l[0],n.rx=Math.max(n.cx,n.x1-n.cx),n.ry=Math.max(n.cy,n.y1-n.cy));break;case"closest-side":case"contain":"circle"===l[0]?n.rx=n.ry=Math.min(n.cx,n.cy,n.x1-n.cx,n.y1-n.cy):(n.type=l[0],n.rx=Math.min(n.cx,n.x1-n.cx),n.ry=Math.min(n.cy,n.y1-n.cy))}if(l=o[5].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\)(?:\s\d{1,3}(?:%|px))?)+/g))for(s=l.length,c=1/Math.max(s-1,1),r=0;s>r;r+=1)d=l[r].match(/((?:rgb|rgba)\(\d{1,3},\s\d{1,3},\s\d{1,3}(?:,\s[0-9\.]+)?\))\s*(\d{1,3})?(%|px)?/),d[2]?(i=parseFloat(d[2]),i/="%"===d[3]?100:e.width):i=r*c,n.colorStops.push({color:d[1],stop:i})}return n},r.Gradient=function(n,r){if(0!==r.width&&0!==r.height){var a,o,i=e.createElement("canvas"),l=i.getContext("2d");if(i.width=r.width,i.height=r.height,a=u.Generate.parseGradient(n,r))switch(a.type){case"linear":o=l.createLinearGradient(a.x0,a.y0,a.x1,a.y1),a.colorStops.forEach(t(o)),l.fillStyle=o,l.fillRect(0,0,r.width,r.height);break;case"circle":o=l.createRadialGradient(a.cx,a.cy,0,a.cx,a.cy,a.rx),a.colorStops.forEach(t(o)),l.fillStyle=o,l.fillRect(0,0,r.width,r.height);break;case"ellipse":var s=e.createElement("canvas"),c=s.getContext("2d"),d=Math.max(a.rx,a.ry),h=2*d;s.width=s.height=h,o=c.createRadialGradient(a.rx,a.ry,0,a.rx,a.ry,d),a.colorStops.forEach(t(o)),c.fillStyle=o,c.fillRect(0,0,h,h),l.fillStyle=a.colorStops[a.colorStops.length-1].color,l.fillRect(0,0,i.width,i.height),l.drawImage(s,a.cx-a.rx,a.cy-a.ry,2*a.rx,2*a.ry)}return i}},r.ListAlpha=function(t){var e,n="";do e=t%26,n=String.fromCharCode(e+64)+n,t/=26;while(26*t>26);return n},r.ListRoman=function(t){var e,n=["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"],r=[1e3,900,500,400,100,90,50,40,10,9,5,4,1],a="",o=n.length;if(0>=t||t>=4e3)return t;for(e=0;o>e;e+=1)for(;t>=r[e];)t-=r[e],a+=n[e];return a}}(),u.Parse=function(r,a){function o(){return Math.max(Math.max(de.body.scrollWidth,de.documentElement.scrollWidth),Math.max(de.body.offsetWidth,de.documentElement.offsetWidth),Math.max(de.body.clientWidth,de.documentElement.clientWidth))}function i(){return Math.max(Math.max(de.body.scrollHeight,de.documentElement.scrollHeight),Math.max(de.body.offsetHeight,de.documentElement.offsetHeight),Math.max(de.body.clientHeight,de.documentElement.clientHeight))}function c(t,e){var n=parseInt(ge(t,e),10);return isNaN(n)?0:n}function d(t,e,n,r,a,o){"transparent"!==o&&(t.setVariable("fillStyle",o),t.fillRect(e,n,r,a),ce+=1)}function h(t,e,r){return t.length>0?e+r.toUpperCase():n}function f(t,e){switch(e){case"lowercase":return t.toLowerCase();case"capitalize":return t.replace(/(^|\s|:|-|\(|\))([a-z])/g,h);case"uppercase":return t.toUpperCase();default:return t}}function p(t){return/^(normal|none|0px)$/.test(t)}function g(t,e,n,r){null!==t&&ue.trimText(t).length>0&&(r.fillText(t,e,n),ce+=1)}function m(t,e,r,a){var o=!1,i=ge(e,"fontWeight"),l=ge(e,"fontFamily"),s=ge(e,"fontSize"),c=ue.parseTextShadows(ge(e,"textShadow"));switch(parseInt(i,10)){case 401:i="bold";break;case 400:i="normal"}return t.setVariable("fillStyle",a),t.setVariable("font",[ge(e,"fontStyle"),ge(e,"fontVariant"),i,s,l].join(" ")),t.setVariable("textAlign",o?"right":"left"),c.length&&(t.setVariable("shadowColor",c[0].color),t.setVariable("shadowOffsetX",c[0].offsetX),t.setVariable("shadowOffsetY",c[0].offsetY),t.setVariable("shadowBlur",c[0].blur)),"none"!==r?ue.Font(l,s,de):n}function y(t,e,n,r,a){switch(e){case"underline":d(t,n.left,Math.round(n.top+r.baseline+r.lineWidth),n.width,1,a);break;case"overline":d(t,n.left,Math.round(n.top),n.width,1,a);break;case"line-through":d(t,n.left,Math.ceil(n.top+r.middle+r.lineWidth),n.width,1,a)}}function b(t,e,n,r,a){var o;if(he.rangeBounds&&!a)("none"!==n||0!==ue.trimText(e).length)&&(o=w(e,t.node,t.textOffset)),t.textOffset+=e.length;else if(t.node&&"string"==typeof t.node.nodeValue){var i=r?t.node.splitText(e.length):null;o=x(t.node,a),t.node=i}return o}function w(t,e,n){var r=de.createRange();return r.setStart(e,n),r.setEnd(e,n+t.length),r.getBoundingClientRect()}function x(t,e){var n=t.parentNode,r=de.createElement("wrapper"),a=t.cloneNode(!0);r.appendChild(t.cloneNode(!0)),n.replaceChild(r,t);var o=e?ue.OffsetBounds(r):ue.Bounds(r);return n.replaceChild(a,r),o}function v(t,e,n){var r,o,i=n.ctx,l=ge(t,"color"),s=ge(t,"textDecoration"),c=ge(t,"textAlign"),d={node:e,textOffset:0};ue.trimText(e.nodeValue).length>0&&(e.nodeValue=f(e.nodeValue,ge(t,"textTransform")),c=c.replace(["-webkit-auto"],["auto"]),o=!a.letterRendering&&/^(left|right|justify|auto)$/.test(c)&&p(ge(t,"letterSpacing"))?e.nodeValue.split(/(\b| )/):e.nodeValue.split(""),r=m(i,t,s,l),a.chinese&&o.forEach(function(t,e){/.*[\u4E00-\u9FA5].*$/.test(t)&&(t=t.split(""),t.unshift(e,1),o.splice.apply(o,t))}),o.forEach(function(t,e){var a=b(d,t,s,o.length-1>e,n.transform.matrix);a&&(g(t,a.left,a.bottom,i),y(i,s,a,r,l))}))}function k(t,e){var n,r,a=de.createElement("boundelement");return a.style.display="inline",n=t.style.listStyleType,t.style.listStyleType="none",a.appendChild(de.createTextNode(e)),t.insertBefore(a,t.firstChild),r=ue.Bounds(a),t.removeChild(a),t.style.listStyleType=n,r}function C(t){var e=-1,n=1,r=t.parentNode.childNodes;if(t.parentNode){for(;r[++e]!==t;)1===r[e].nodeType&&n++;return n}return-1}function T(t,e){var n,r=C(t);switch(e){case"decimal":n=r;break;case"decimal-leading-zero":n=1===(""+r).length?r="0"+(""+r):""+r;break;case"upper-roman":n=u.Generate.ListRoman(r);break;case"lower-roman":n=u.Generate.ListRoman(r).toLowerCase();break;case"lower-alpha":n=u.Generate.ListAlpha(r).toLowerCase();break;case"upper-alpha":n=u.Generate.ListAlpha(r)}return n+". "}function S(t,e,n){var r,a,o,i=e.ctx,l=ge(t,"listStyleType");if(/^(decimal|decimal-leading-zero|upper-alpha|upper-latin|upper-roman|lower-alpha|lower-greek|lower-latin|lower-roman)$/i.test(l)){if(a=T(t,l),o=k(t,a),m(i,t,"none",ge(t,"color")),"inside"!==ge(t,"listStylePosition"))return;i.setVariable("textAlign","left"),r=n.left,g(a,r,o.bottom,i)}}function M(t){var e=r[t];return e&&e.succeeded===!0?e.img:!1}function R(t,e){var n=Math.max(t.left,e.left),r=Math.max(t.top,e.top),a=Math.min(t.left+t.width,e.left+e.width),o=Math.min(t.top+t.height,e.top+e.height);return{left:n,top:r,width:a-n,height:o-r}}function E(t,e,n){var r,a="static"!==e.cssPosition,o=a?ge(t,"zIndex"):"auto",i=ge(t,"opacity"),l="none"!==ge(t,"cssFloat");e.zIndex=r=s(o),r.isPositioned=a,r.isFloated=l,r.opacity=i,r.ownStacking="auto"!==o||1>i,n&&n.zIndex.children.push(e)}function I(t,e,n,r,a){var o=c(e,"paddingLeft"),i=c(e,"paddingTop"),l=c(e,"paddingRight"),s=c(e,"paddingBottom");$(t,n,0,0,n.width,n.height,r.left+o+a[3].width,r.top+i+a[0].width,r.width-(a[1].width+a[3].width+o+l),r.height-(a[0].width+a[2].width+i+s))}function L(t){return["Top","Right","Bottom","Left"].map(function(e){return{width:c(t,"border"+e+"Width"),color:ge(t,"border"+e+"Color")}})}function O(t){return["TopLeft","TopRight","BottomRight","BottomLeft"].map(function(e){return ge(t,"border"+e+"Radius")})}function z(t,e,n,r){var a=function(t,e,n){return{x:t.x+(e.x-t.x)*n,y:t.y+(e.y-t.y)*n}};return{start:t,startControl:e,endControl:n,end:r,subdivide:function(o){var i=a(t,e,o),l=a(e,n,o),s=a(n,r,o),c=a(i,l,o),d=a(l,s,o),u=a(c,d,o);return[z(t,i,c,u),z(u,d,s,r)]},curveTo:function(t){t.push(["bezierCurve",e.x,e.y,n.x,n.y,r.x,r.y])},curveToReversed:function(r){r.push(["bezierCurve",n.x,n.y,e.x,e.y,t.x,t.y])}}}function A(t,e,n,r,a,o,i){e[0]>0||e[1]>0?(t.push(["line",r[0].start.x,r[0].start.y]),r[0].curveTo(t),r[1].curveTo(t)):t.push(["line",o,i]),(n[0]>0||n[1]>0)&&t.push(["line",a[0].start.x,a[0].start.y])}function B(t,e,n,r,a,o,i){var l=[];return e[0]>0||e[1]>0?(l.push(["line",r[1].start.x,r[1].start.y]),r[1].curveTo(l)):l.push(["line",t.c1[0],t.c1[1]]),n[0]>0||n[1]>0?(l.push(["line",o[0].start.x,o[0].start.y]),o[0].curveTo(l),l.push(["line",i[0].end.x,i[0].end.y]),i[0].curveToReversed(l)):(l.push(["line",t.c2[0],t.c2[1]]),l.push(["line",t.c3[0],t.c3[1]])),e[0]>0||e[1]>0?(l.push(["line",a[1].end.x,a[1].end.y]),a[1].curveToReversed(l)):l.push(["line",t.c4[0],t.c4[1]]),l}function U(t,e,n){var r=t.left,a=t.top,o=t.width,i=t.height,l=e[0][0],s=e[0][1],c=e[1][0],d=e[1][1],u=e[2][0],h=e[2][1],f=e[3][0],p=e[3][1],g=o-c,m=i-h,y=o-u,b=i-p;return{topLeftOuter:be(r,a,l,s).topLeft.subdivide(.5),topLeftInner:be(r+n[3].width,a+n[0].width,Math.max(0,l-n[3].width),Math.max(0,s-n[0].width)).topLeft.subdivide(.5),topRightOuter:be(r+g,a,c,d).topRight.subdivide(.5),topRightInner:be(r+Math.min(g,o+n[3].width),a+n[0].width,g>o+n[3].width?0:c-n[3].width,d-n[0].width).topRight.subdivide(.5),bottomRightOuter:be(r+y,a+m,u,h).bottomRight.subdivide(.5),bottomRightInner:be(r+Math.min(y,o+n[3].width),a+Math.min(m,i+n[0].width),Math.max(0,u-n[1].width),Math.max(0,h-n[2].width)).bottomRight.subdivide(.5),bottomLeftOuter:be(r,a+b,f,p).bottomLeft.subdivide(.5),bottomLeftInner:be(r+n[3].width,a+b,Math.max(0,f-n[3].width),Math.max(0,p-n[2].width)).bottomLeft.subdivide(.5)}}function N(t,e,n,r,a){var o=ge(t,"backgroundClip"),i=[];switch(o){case"content-box":case"padding-box":A(i,r[0],r[1],e.topLeftInner,e.topRightInner,a.left+n[3].width,a.top+n[0].width),A(i,r[1],r[2],e.topRightInner,e.bottomRightInner,a.left+a.width-n[1].width,a.top+n[0].width),A(i,r[2],r[3],e.bottomRightInner,e.bottomLeftInner,a.left+a.width-n[1].width,a.top+a.height-n[2].width),A(i,r[3],r[0],e.bottomLeftInner,e.topLeftInner,a.left+n[3].width,a.top+a.height-n[2].width);break;default:A(i,r[0],r[1],e.topLeftOuter,e.topRightOuter,a.left,a.top),A(i,r[1],r[2],e.topRightOuter,e.bottomRightOuter,a.left+a.width,a.top),A(i,r[2],r[3],e.bottomRightOuter,e.bottomLeftOuter,a.left+a.width,a.top+a.height),A(i,r[3],r[0],e.bottomLeftOuter,e.topLeftOuter,a.left,a.top+a.height)}return i}function P(t,e,n){var r,a,o,i,l,s,c=e.left,d=e.top,u=e.width,h=e.height,f=O(t),p=U(e,f,n),g={clip:N(t,p,n,f,e),borders:[]};for(r=0;4>r;r++)if(n[r].width>0){switch(a=c,o=d,i=u,l=h-n[2].width,r){case 0:l=n[0].width,s=B({c1:[a,o],c2:[a+i,o],c3:[a+i-n[1].width,o+l],c4:[a+n[3].width,o+l]},f[0],f[1],p.topLeftOuter,p.topLeftInner,p.topRightOuter,p.topRightInner);break;case 1:a=c+u-n[1].width,i=n[1].width,s=B({c1:[a+i,o],c2:[a+i,o+l+n[2].width],c3:[a,o+l],c4:[a,o+n[0].width]},f[1],f[2],p.topRightOuter,p.topRightInner,p.bottomRightOuter,p.bottomRightInner);break;case 2:o=o+h-n[2].width,l=n[2].width,s=B({c1:[a+i,o+l],c2:[a,o+l],c3:[a+n[3].width,o],c4:[a+i-n[3].width,o]},f[2],f[3],p.bottomRightOuter,p.bottomRightInner,p.bottomLeftOuter,p.bottomLeftInner);break;case 3:i=n[3].width,s=B({c1:[a,o+l+n[2].width],c2:[a,o],c3:[a+i,o+n[0].width],c4:[a+i,o+l]},f[3],f[0],p.bottomLeftOuter,p.bottomLeftInner,p.topLeftOuter,p.topLeftInner)}g.borders.push({args:s,color:n[r].color})}return g}function F(t,e){var n=t.drawShape();return e.forEach(function(t,e){n[0===e?"moveTo":t[0]+"To"].apply(null,t.slice(1))}),n}function V(t,e,n){"transparent"!==n&&(t.setVariable("fillStyle",n),F(t,e),t.fill(),ce+=1)}function D(t,e,n){var r,a,o=de.createElement("valuewrap"),i=["lineHeight","textAlign","fontFamily","color","fontSize","paddingLeft","paddingTop","width","height","border","borderLeftWidth","borderTopWidth"];i.forEach(function(e){try{o.style[e]=ge(t,e)}catch(n){ue.log("html2canvas: Parse: Exception caught in renderFormValue: "+n.message)}}),o.style.borderColor="black",o.style.borderStyle="solid",o.style.display="block",o.style.position="absolute",(/^(submit|reset|button|text|password)$/.test(t.type)||"SELECT"===t.nodeName)&&(o.style.lineHeight=ge(t,"height")),o.style.top=e.top+"px",o.style.left=e.left+"px",r="SELECT"===t.nodeName?(t.options[t.selectedIndex]||0).text:t.value,r||(r=t.placeholder),a=de.createTextNode(r),o.appendChild(a),pe.appendChild(o),v(t,a,n),pe.removeChild(o)}function $(t){t.drawImage.apply(t,Array.prototype.slice.call(arguments,1)),ce+=1}function G(n,r){var a=t.getComputedStyle(n,r);if(a&&a.content&&"none"!==a.content&&"-moz-alt-content"!==a.content&&"none"!==a.display){var o=a.content+"",i=o.substr(0,1);i===o.substr(o.length-1)&&i.match(/'|"/)&&(o=o.substr(1,o.length-2));var l="url"===o.substr(0,3),s=e.createElement(l?"img":"span");return s.className=me+"-before "+me+"-after",Object.keys(a).filter(W).forEach(function(t){try{s.style[t]=a[t]}catch(e){ue.log(["Tried to assign readonly property ",t,"Error:",e])}}),l?s.src=ue.parseBackgroundImage(o)[0].args[0]:s.innerHTML=o,s}}function W(e){return isNaN(t.parseInt(e,10))}function H(t,e){var n=G(t,":before"),r=G(t,":after");(n||r)&&(n&&(t.className+=" "+me+"-before",t.parentNode.insertBefore(n,t),oe(n,e,!0),t.parentNode.removeChild(n),t.className=t.className.replace(me+"-before","").trim()),r&&(t.className+=" "+me+"-after",t.appendChild(r),oe(r,e,!0),t.removeChild(r),t.className=t.className.replace(me+"-after","").trim()))}function j(t,e,n,r){var a=Math.round(r.left+n.left),o=Math.round(r.top+n.top);t.createPattern(e),t.translate(a,o),t.fill(),t.translate(-a,-o)}function q(t,e,n,r,a,o,i,l){var s=[];s.push(["line",Math.round(a),Math.round(o)]),s.push(["line",Math.round(a+i),Math.round(o)]),s.push(["line",Math.round(a+i),Math.round(l+o)]),s.push(["line",Math.round(a),Math.round(l+o)]),F(t,s),t.save(),t.clip(),j(t,e,n,r),t.restore()}function X(t,e,n){d(t,e.left,e.top,e.width,e.height,n)}function _(t,e,n,r,a){var o=ue.BackgroundSize(t,e,r,a),i=ue.BackgroundPosition(t,e,r,a,o),l=ge(t,"backgroundRepeat").split(",").map(ue.trimText);switch(r=Q(r,o),l=l[a]||l[0]){case"repeat-x":q(n,r,i,e,e.left,e.top+i.top,99999,r.height);break;case"repeat-y":q(n,r,i,e,e.left+i.left,e.top,r.width,99999);break;case"no-repeat":q(n,r,i,e,e.left+i.left,e.top+i.top,r.width,r.height);break;default:j(n,r,i,{top:e.top,left:e.left,width:r.width,height:r.height})}}function Y(t,e,n){for(var r,a=ge(t,"backgroundImage"),o=ue.parseBackgroundImage(a),i=o.length;i--;)if(a=o[i],a.args&&0!==a.args.length){var l="url"===a.method?a.args[0]:a.value;r=M(l),r?_(t,e,n,r,i):ue.log("html2canvas: Error loading background:",a)}}function Q(t,e){if(t.width===e.width&&t.height===e.height)return t;var n,r=de.createElement("canvas");return r.width=e.width,r.height=e.height,n=r.getContext("2d"),$(n,t,0,0,t.width,t.height,0,0,e.width,e.height),r}function J(t,e,n){return t.setVariable("globalAlpha",ge(e,"opacity")*(n?n.opacity:1))}function K(t){return t.replace("px","")}function Z(t){var e=ge(t,"transform")||ge(t,"-webkit-transform")||ge(t,"-moz-transform")||ge(t,"-ms-transform")||ge(t,"-o-transform"),n=ge(t,"transform-origin")||ge(t,"-webkit-transform-origin")||ge(t,"-moz-transform-origin")||ge(t,"-ms-transform-origin")||ge(t,"-o-transform-origin")||"0px 0px";n=n.split(" ").map(K).map(ue.asFloat);var r;if(e&&"none"!==e){var a=e.match(we);if(a)switch(a[1]){case"matrix":r=a[2].split(",").map(ue.trimText).map(ue.asFloat)}}return{origin:n,matrix:r}}function te(t,e,n,r){var s=l(e?n.width:o(),e?n.height:i()),c={ctx:s,opacity:J(s,t,e),cssPosition:ge(t,"position"),borders:L(t),transform:r,clip:e&&e.clip?ue.Extend({},e.clip):null};return E(t,c,e),a.useOverflow===!0&&/(hidden|scroll|auto)/.test(ge(t,"overflow"))===!0&&/(BODY)/i.test(t.nodeName)===!1&&(c.clip=c.clip?R(c.clip,n):n),c}function ee(t,e,n){var r={left:e.left+t[3].width,top:e.top+t[0].width,width:e.width-(t[1].width+t[3].width),height:e.height-(t[0].width+t[2].width)};return n&&(r=R(r,n)),r}function ne(t,e){var n=e.matrix?ue.OffsetBounds(t):ue.Bounds(t);return e.origin[0]+=n.left,e.origin[1]+=n.top,n}function re(t,e,n,r){var a,o=Z(t,e),i=ne(t,o),l=te(t,e,i,o),s=l.borders,c=l.ctx,d=ee(s,i,l.clip),u=P(t,i,s),h=fe.test(t.nodeName)?"#efefef":ge(t,"backgroundColor");switch(F(c,u.clip),c.save(),c.clip(),d.height>0&&d.width>0&&!r?(X(c,i,h),Y(t,d,c)):r&&(l.backgroundColor=h),c.restore(),u.borders.forEach(function(t){V(c,t.args,t.color)}),n||H(t,l),t.nodeName){case"IMG":(a=M(t.getAttribute("src")))?I(c,t,a,i,s):ue.log("html2canvas: Error loading <img>:"+t.getAttribute("src"));break;case"INPUT":/^(text|url|email|submit|button|reset)$/.test(t.type)&&(t.value||t.placeholder||"").length>0&&D(t,i,l);break;case"TEXTAREA":(t.value||t.placeholder||"").length>0&&D(t,i,l);break;case"SELECT":(t.options||t.placeholder||"").length>0&&D(t,i,l);break;case"LI":S(t,l,d);break;case"CANVAS":I(c,t,t,i,s)}return l}function ae(t){return"none"!==ge(t,"display")&&"hidden"!==ge(t,"visibility")&&!t.hasAttribute("data-html2canvas-ignore")}function oe(t,e,n){ae(t)&&(e=re(t,e,n,!1)||e,fe.test(t.nodeName)||ie(t,e,n))}function ie(t,e,n){ue.Children(t).forEach(function(r){r.nodeType===r.ELEMENT_NODE?oe(r,e,n):r.nodeType===r.TEXT_NODE&&v(t,r,e)})}function le(){var t=ge(e.documentElement,"backgroundColor"),n=ue.isTransparent(t)&&se===e.body,r=re(se,null,!1,n);return ie(se,r),n&&(t=r.backgroundColor),pe.removeChild(ye),{backgroundColor:t,stack:r}}t.scroll(0,0);var se=a.elements===n?e.body:a.elements[0],ce=0,de=se.ownerDocument,ue=u.Util,he=ue.Support(a,de),fe=RegExp("("+a.ignoreElements+")"),pe=de.body,ge=ue.getCSS,me="___html2canvas___pseudoelement",ye=de.createElement("style");ye.innerHTML="."+me+'-before:before { content: "" !important; display: none !important; }'+"."+me+'-after:after { content: "" !important; display: none !important; }',pe.appendChild(ye),r=r||{};var be=function(t){return function(e,n,r,a){var o=r*t,i=a*t,l=e+r,s=n+a;return{topLeft:z({x:e,y:s},{x:e,y:s-i},{x:l-o,y:n},{x:l,y:n}),topRight:z({x:e,y:n},{x:e+o,y:n},{x:l,y:s-i},{x:l,y:s}),bottomRight:z({x:l,y:n},{x:l,y:n+i},{x:e+o,y:s},{x:e,y:s}),bottomLeft:z({x:l,y:s},{x:l-o,y:s},{x:e,y:n+i},{x:e,y:n})}}}(4*((Math.sqrt(2)-1)/3)),we=/(matrix)\((.+)\)/;return le()},u.Preload=function(r){function a(t){M.href=t,M.href=M.href;var e=M.protocol+M.host;return e===g}function o(){x.log("html2canvas: start: images: "+w.numLoaded+" / "+w.numTotal+" (failed: "+w.numFailed+")"),!w.firstRun&&w.numLoaded>=w.numTotal&&(x.log("Finished loading images: # "+w.numTotal+" (failed: "+w.numFailed+")"),"function"==typeof r.complete&&r.complete(w))}function i(e,a,i){var l,s,c=r.proxy;M.href=e,e=M.href,l="html2canvas_"+v++,i.callbackname=l,c+=c.indexOf("?")>-1?"&":"?",c+="url="+encodeURIComponent(e)+"&callback="+l,s=C.createElement("script"),t[l]=function(e){"error:"===e.substring(0,6)?(i.succeeded=!1,w.numLoaded++,w.numFailed++,o()):(p(a,i),a.src=e),t[l]=n;try{delete t[l]}catch(r){}s.parentNode.removeChild(s),s=null,delete i.script,delete i.callbackname},s.setAttribute("type","text/javascript"),s.setAttribute("src",c),i.script=s,t.document.body.appendChild(s)}function l(e,n){var r=t.getComputedStyle(e,n),a=r.content;"url"===a.substr(0,3)&&m.loadImage(u.Util.parseBackgroundImage(a)[0].args[0]),h(r.backgroundImage,e)}function s(t){l(t,":before"),l(t,":after")}function c(t,e){var r=u.Generate.Gradient(t,e);r!==n&&(w[t]={img:r,succeeded:!0},w.numTotal++,w.numLoaded++,o())}function d(t){return t&&t.method&&t.args&&t.args.length>0}function h(t,e){var r;u.Util.parseBackgroundImage(t).filter(d).forEach(function(t){"url"===t.method?m.loadImage(t.args[0]):t.method.match(/\-?gradient$/)&&(r===n&&(r=u.Util.Bounds(e)),c(t.value,r))})}function f(t){var e=!1;try{x.Children(t).forEach(f)}catch(r){}try{e=t.nodeType}catch(a){e=!1,x.log("html2canvas: failed to access some element's nodeType - Exception: "+a.message)}if(1===e||e===n){s(t);try{h(x.getCSS(t,"backgroundImage"),t)}catch(r){x.log("html2canvas: failed to get background-image - Exception: "+r.message)}h(t)}}function p(e,a){e.onload=function(){a.timer!==n&&t.clearTimeout(a.timer),w.numLoaded++,a.succeeded=!0,e.onerror=e.onload=null,o()},e.onerror=function(){if("anonymous"===e.crossOrigin&&(t.clearTimeout(a.timer),r.proxy)){var l=e.src;return e=new Image,a.img=e,e.src=l,i(e.src,e,a),n}w.numLoaded++,w.numFailed++,a.succeeded=!1,e.onerror=e.onload=null,o()}}var g,m,y,b,w={numLoaded:0,numFailed:0,numTotal:0,cleanupDone:!1},x=u.Util,v=0,k=r.elements[0]||e.body,C=k.ownerDocument,T=k.getElementsByTagName("img"),S=T.length,M=C.createElement("a"),R=function(t){return t.crossOrigin!==n}(new Image);for(M.href=t.location.href,g=M.protocol+M.host,m={loadImage:function(t){var e,o;t&&w[t]===n&&(e=new Image,t.match(/data:image\/.*;base64,/i)?(e.src=t.replace(/url\(['"]{0,}|['"]{0,}\)$/gi,""),o=w[t]={img:e},w.numTotal++,p(e,o)):a(t)||r.allowTaint===!0?(o=w[t]={img:e},w.numTotal++,p(e,o),e.src=t):R&&!r.allowTaint&&r.useCORS?(e.crossOrigin="anonymous",o=w[t]={img:e},w.numTotal++,p(e,o),e.src=t):r.proxy&&(o=w[t]={img:e},w.numTotal++,i(t,e,o)))},cleanupDOM:function(a){var i,l;if(!w.cleanupDone){a&&"string"==typeof a?x.log("html2canvas: Cleanup because: "+a):x.log("html2canvas: Cleanup after timeout: "+r.timeout+" ms.");for(l in w)if(w.hasOwnProperty(l)&&(i=w[l],"object"==typeof i&&i.callbackname&&i.succeeded===n)){t[i.callbackname]=n;try{delete t[i.callbackname]}catch(s){}i.script&&i.script.parentNode&&(i.script.setAttribute("src","about:blank"),i.script.parentNode.removeChild(i.script)),w.numLoaded++,w.numFailed++,x.log("html2canvas: Cleaned up failed img: '"+l+"' Steps: "+w.numLoaded+" / "+w.numTotal)}t.stop!==n?t.stop():e.execCommand!==n&&e.execCommand("Stop",!1),e.close!==n&&e.close(),w.cleanupDone=!0,a&&"string"==typeof a||o()}},renderingDone:function(){b&&t.clearTimeout(b)}},r.timeout>0&&(b=t.setTimeout(m.cleanupDOM,r.timeout)),x.log("html2canvas: Preload starts: finding background-images"),w.firstRun=!0,f(k),x.log("html2canvas: Preload: Finding images"),y=0;S>y;y+=1)m.loadImage(T[y].getAttribute("src"));return w.firstRun=!1,x.log("html2canvas: Preload: Done."),w.numTotal===w.numLoaded&&o(),m},u.Renderer=function(t,r){function a(t){function e(t){Object.keys(t).sort().forEach(function(n){var r=[],o=[],i=[],l=[];
+t[n].forEach(function(t){t.node.zIndex.isPositioned||1>t.node.zIndex.opacity?i.push(t):t.node.zIndex.isFloated?o.push(t):r.push(t)}),function s(t){t.forEach(function(t){l.push(t),t.children&&s(t.children)})}(r.concat(o,i)),l.forEach(function(t){t.context?e(t.context):a.push(t.node)})})}var r,a=[];return r=function(t){function e(t,r,a){var o="auto"===r.zIndex.zindex?0:Number(r.zIndex.zindex),i=t,l=r.zIndex.isPositioned,s=r.zIndex.isFloated,c={node:r},d=a;r.zIndex.ownStacking?(i=c.context={"!":[{node:r,children:[]}]},d=n):(l||s)&&(d=c.children=[]),0===o&&a?a.push(c):(t[o]||(t[o]=[]),t[o].push(c)),r.zIndex.children.forEach(function(t){e(i,t,d)})}var r={};return e(r,t),r}(t),e(r),a}function o(t){var e;if("string"==typeof r.renderer&&u.Renderer[t]!==n)e=u.Renderer[t](r);else{if("function"!=typeof t)throw Error("Unknown renderer");e=t(r)}if("function"!=typeof e)throw Error("Invalid renderer defined");return e}return o(r.renderer)(t,r,e,a(t.stack),u)},u.Util.Support=function(t,e){function r(){var t=new Image,r=e.createElement("canvas"),a=r.getContext===n?!1:r.getContext("2d");if(a===!1)return!1;r.width=r.height=10,t.src=["data:image/svg+xml,","<svg xmlns='http://www.w3.org/2000/svg' width='10' height='10'>","<foreignObject width='10' height='10'>","<div xmlns='http://www.w3.org/1999/xhtml' style='width:10;height:10;'>","sup","</div>","</foreignObject>","</svg>"].join("");try{a.drawImage(t,0,0),r.toDataURL()}catch(o){return!1}return u.Util.log("html2canvas: Parse: SVG powered rendering available"),!0}function a(){var t,n,r,a,o=!1;return e.createRange&&(t=e.createRange(),t.getBoundingClientRect&&(n=e.createElement("boundtest"),n.style.height="123px",n.style.display="block",e.body.appendChild(n),t.selectNode(n),r=t.getBoundingClientRect(),a=r.height,123===a&&(o=!0),e.body.removeChild(n))),o}return{rangeBounds:a(),svgRendering:t.svgRendering&&r()}},t.html2canvas=function(e,n){e=e.length?e:[e];var r,a,o={logging:!1,elements:e,background:"#fff",proxy:null,timeout:0,useCORS:!1,allowTaint:!1,svgRendering:!1,ignoreElements:"IFRAME|OBJECT|PARAM",useOverflow:!0,letterRendering:!1,chinese:!1,width:null,height:null,taintTest:!0,renderer:"Canvas"};return o=u.Util.Extend(n,o),u.logging=o.logging,o.complete=function(t){("function"!=typeof o.onpreloaded||o.onpreloaded(t)!==!1)&&(r=u.Parse(t,o),("function"!=typeof o.onparsed||o.onparsed(r)!==!1)&&(a=u.Renderer(r,o),"function"==typeof o.onrendered&&o.onrendered(a)))},t.setTimeout(function(){u.Preload(o)},0),{render:function(t,e){return u.Renderer(t,u.Util.Extend(e,o))},parse:function(t,e){return u.Parse(t,u.Util.Extend(e,o))},preload:function(t){return u.Preload(u.Util.Extend(t,o))},log:u.Util.log}},t.html2canvas.log=u.Util.log,t.html2canvas.Renderer={Canvas:n},u.Renderer.Canvas=function(t){function r(t,e){t.beginPath(),e.forEach(function(e){t[e.name].apply(t,e.arguments)}),t.closePath()}function a(t){if(-1===l.indexOf(t.arguments[0].src)){c.drawImage(t.arguments[0],0,0);try{c.getImageData(0,0,1,1)}catch(e){return s=i.createElement("canvas"),c=s.getContext("2d"),!1}l.push(t.arguments[0].src)}return!0}function o(e,n){switch(n.type){case"variable":e[n.name]=n.arguments;break;case"function":switch(n.name){case"createPattern":if(n.arguments[0].width>0&&n.arguments[0].height>0)try{e.fillStyle=e.createPattern(n.arguments[0],"repeat")}catch(o){d.log("html2canvas: Renderer: Error creating pattern",o.message)}break;case"drawShape":r(e,n.arguments);break;case"drawImage":n.arguments[8]>0&&n.arguments[7]>0&&(!t.taintTest||t.taintTest&&a(n))&&e.drawImage.apply(e,n.arguments);break;default:e[n.name].apply(e,n.arguments)}}}t=t||{};var i=e,l=[],s=e.createElement("canvas"),c=s.getContext("2d"),d=u.Util,h=t.canvas||i.createElement("canvas");return function(t,e,r,a,i){var l,s,c,u=h.getContext("2d"),f=t.stack;return h.width=h.style.width=e.width||f.ctx.width,h.height=h.style.height=e.height||f.ctx.height,c=u.fillStyle,u.fillStyle=d.isTransparent(f.backgroundColor)&&e.background!==n?e.background:t.backgroundColor,u.fillRect(0,0,h.width,h.height),u.fillStyle=c,a.forEach(function(t){u.textBaseline="bottom",u.save(),t.transform.matrix&&(u.translate(t.transform.origin[0],t.transform.origin[1]),u.transform.apply(u,t.transform.matrix),u.translate(-t.transform.origin[0],-t.transform.origin[1])),t.clip&&(u.beginPath(),u.rect(t.clip.left,t.clip.top,t.clip.width,t.clip.height),u.clip()),t.ctx.storage&&t.ctx.storage.forEach(function(t){o(u,t)}),u.restore()}),d.log("html2canvas: Renderer: Canvas renderer done - returning canvas obj"),1===e.elements.length&&"object"==typeof e.elements[0]&&"BODY"!==e.elements[0].nodeName?(s=i.Util.Bounds(e.elements[0]),l=r.createElement("canvas"),l.width=Math.ceil(s.width),l.height=Math.ceil(s.height),u=l.getContext("2d"),u.drawImage(h,s.left,s.top,s.width,s.height,0,0,s.width,s.height),h=null,l):h}}})(window,document);
\ No newline at end of file
diff --git a/publications/getAllPubs_func.php b/publications/getAllPubs_func.php
index 888e79cd..f17fd9d9 100644
--- a/publications/getAllPubs_func.php
+++ b/publications/getAllPubs_func.php
@@ -203,7 +203,7 @@ function removeDuplicates($token, $server, $rows, $recordId) {
 				echo "Duplicate in record $recordId (instance $instance)!\n";
                 Upload::deleteFormInstances($token, $server, $pid, "citation", $recordId, [$instance]);
 			} else if (($row['citation_include'] === '1') || ($row['citation_include'] === '')) {
-				array_push($alreadySeen, $pmid);
+				$alreadySeen[] = $pmid;
 			}
 		}
 	}
@@ -270,12 +270,12 @@ function processVICTR(&$citationIds, &$maxInstances, $token, $server, $pid, $rec
                         foreach ($uploadRows as $uploadRow) {
                             // mark to include only for VICTR
                             $uploadRow['citation_include'] = '1';
-                            array_push($upload, $uploadRow);
+                            $upload[] = $uploadRow;
                         }
                         if (!isset($citationIds['Final'][$recordId])) {
                             $citationIds['Final'][$recordId] = array();
                         }
-                        array_push($citationIds['Final'][$recordId], $newCitationId);
+                        $citationIds['Final'][$recordId][] = $newCitationId;
                     } else {
                         $citationIdsForRecord = [];
                         foreach ($citationIds as $type => $recordsWithData) {
@@ -342,21 +342,13 @@ function processPubMed(&$citationIds, &$maxInstances, $token, $server, $pid, $re
         $middle = "";     // can set at some future point as this is searchable
         foreach ($lastNames as $lastName) {
 			foreach ($firstNames as $firstName) {
-				foreach ($institutions as $institution) {
-					if ($institution) {
-						if ($middle) {
-							$firstName .= " ".$middle;
-						}
-						CareerDev::log("Searching $lastName $firstName at $institution");
-						echo "Searching $lastName $firstName at $institution\n";
-                        $currPMIDs = Publications::searchPubMedForName($firstName, $lastName, $pid, $institution);
-                        $uniquePMIDs = array_unique(array_merge($uniquePMIDs, $currPMIDs));
-					}
-				}
-
-				// $naturalFirstName = REDCapManagement::stripNickname($allFirstNames[$recordId]);
-                // $currPMIDs = Publications::searchPubMedForName($naturalFirstName." ".$allLastNames[$recordId]);
-                // addPMIDsIfNotFound($pmids, $citationIds, $currPMIDs, $recordId);
+                if ($middle) {
+                    $firstName .= " ".$middle;
+                }
+                Application::log("Searching $lastName $firstName at ". implode(", ", $institutions), $pid);
+                echo "Searching $lastName $firstName at ".implode(", ", $institutions)."\n";
+                $currPMIDs = Publications::searchPubMedForName($firstName, $lastName, $pid, $institutions);
+                $uniquePMIDs = array_unique(array_merge($uniquePMIDs, $currPMIDs));
 			}
 		}
         addPMIDsIfNotFound($pmids, $citationIds, $uniquePMIDs, $recordId);
@@ -471,7 +463,7 @@ function binREDCapRows($redcapData, &$citationIds) {
 
 			if ($type) {
 				// CareerDev::log("Pushing {$row['citation_pmid']} to $type:$recordId");
-				array_push($citationIds[$type][$recordId], $row['citation_pmid']);
+				$citationIds[$type][$recordId][] = $row['citation_pmid'];
 			} else {
 				throw new \Exception("Could not find type for record {$recordId}.");
 			}
diff --git a/socialNetwork/collaboration.php b/socialNetwork/collaboration.php
index f325a57a..ce354ef6 100644
--- a/socialNetwork/collaboration.php
+++ b/socialNetwork/collaboration.php
@@ -305,7 +305,7 @@
     if (!$noCollaborations) {
         $atBottomOfPage = (!$includeHeaders || isset($_GET['grants']));
         echo makeLegendHTML($indexByField);
-        $socialNetwork = new SocialNetworkChart($networkChartName, $chartData);
+        $socialNetwork = new SocialNetworkChart($networkChartName, $chartData, $pid);
         $socialNetwork->setNonRibbon(count($uniqueNames) > 100);
         echo $socialNetwork->getImportHTML();
         echo $socialNetwork->getHTML(900, 900, TRUE, [], $atBottomOfPage);
diff --git a/testConnectivity.php b/testConnectivity.php
index 62be0bea..94870b8a 100644
--- a/testConnectivity.php
+++ b/testConnectivity.php
@@ -8,7 +8,7 @@
 
 if ($_POST['turn_on'] || $_POST['turn_off']) {
     if ($_POST['turn_on']) {
-        $value = "1";
+        $value = time();
     } else if ($_POST['turn_off']) {
         $value = "";
     } else {
@@ -22,13 +22,14 @@
 require_once(dirname(__FILE__)."/charts/baseWeb.php");
 require_once(dirname(__FILE__)."/drivers/14_connectivity.php");
 
+$oneHour = 3600;
 $cronStatus = CareerDev::getSetting("send_cron_status", $pid);
-if ($cronStatus) {
+if ($cronStatus && (time() <= $cronStatus + $oneHour)) {
     $status = "On";
     $link = "<button id='status_link' onclick='turnOffStatusCron(); return false;'>Turn off status cron</button>";
 } else {
     $status = "Off";
-    $link = "<button id='status_link' onclick='turnOnStatusCron(); return false;'>Turn on status cron</button>";
+    $link = "<button id='status_link' onclick='turnOnStatusCron(); return false;'>Turn on status cron (for max of 60 minutes)</button>";
 }
 $statusMssg = "<p class='centered max-width padded' style='background-color: rgba(128,128,128,0.3); margin: auto;'>Current Cron Connectivity-Checker Status: <span class='bolded' id='status'>$status</span>. $link<br>If enabled, status alerts every minute are sent to $adminEmail.</p>"