diff --git a/package.nw/lib/pota.js b/package.nw/lib/pota.js
index 00fd619c..525a0d59 100644
--- a/package.nw/lib/pota.js
+++ b/package.nw/lib/pota.js
@@ -137,7 +137,7 @@ function makeParkFeatures()
         for (const call in GT.pota.parkSpots[park])
         {
           var report = GT.pota.parkSpots[park][call];
-          if (parkObj.feature == null && validateMapBandAndMode(report.band, report.mode))
+          if (parkObj.feature == null && validateMapBandAndMode(report.band, report.mode) && Date.now() < report.expire)
           {
             parkObj.feature = iconFeature(ol.proj.fromLonLat([Number(GT.pota.parks[park].longitude), Number(GT.pota.parks[park].latitude)]), GT.gtParkIconActive, 1);
             parkObj.feature.key = park;
@@ -205,7 +205,7 @@ function potaSpotFromDecode(callObj)
       if (!(hash in GT.pota.rbnReportTimes) || Date.now() > GT.pota.rbnReportTimes[hash])
       {
         GT.pota.rbnReportTimes[hash] = Date.now() + GT.pota.rbnFrequency;
-        reportPotaRBN(GT.pota.parkSpots[park][callObj.DEcall]);
+        // reportPotaRBN(GT.pota.parkSpots[park][callObj.DEcall]);
       }
     }
     else
@@ -434,12 +434,14 @@ function processPotaSpots(buffer)
       GT.pota.parkSpots = {};
       for (const spot in spots)
       {
+        console.log(spots[spot]);
         if (spots[spot].reference in GT.pota.parks)
         {
           var newSpot = fillObjectFromTemplate(GT.potaSpotTemplate, spots[spot]);
           newSpot.spotTime = Date.parse(newSpot.spotTime + "Z");
           newSpot.frequency = parseInt(newSpot.frequency) / 1000;
-          newSpot.expire = newSpot.spotTime + (Number(newSpot.expire) * 1000);
+
+          newSpot.expire = Date.now() + (Number(newSpot.expire) * 1000);
           newSpot.band = formatBand(newSpot.frequency);
           if (newSpot.spotter == newSpot.activator && newSpot.comments.match(/qrt/gi))
           {
diff --git a/package.nw/lib/roster/renderRoster.js b/package.nw/lib/roster/renderRoster.js
index 7225828a..989cb645 100644
--- a/package.nw/lib/roster/renderRoster.js
+++ b/package.nw/lib/roster/renderRoster.js
@@ -70,7 +70,7 @@ function renderRoster(callRoster, rosterSettings)
   // let visibleCallList = callRoster.filter(entry => entry.tx);
 
   let visibleCallList = [];
-  for (entry in callRoster)
+  for (const entry in callRoster)
   {
     // entry should populate in general
     if (callRoster[entry].tx)
@@ -123,7 +123,7 @@ function renderRoster(callRoster, rosterSettings)
   let worker = CR.rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders(rosterColumns);
 
   // Third loop: render all rows
-  for (let x in visibleCallList)
+  for (const x in visibleCallList)
   {
     let callObj = visibleCallList[x].callObj;