diff --git a/CumulusMX/Api.cs b/CumulusMX/Api.cs
index 6e23eca6..6f88668a 100644
--- a/CumulusMX/Api.cs
+++ b/CumulusMX/Api.cs
@@ -115,14 +115,14 @@ public async Task GetEditData(string req)
 								await writer.WriteAsync(dataEditor.GetRecordsLogFile("thisyear"));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/edit: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -178,14 +178,14 @@ public async Task PostEditData(string req)
 								await writer.WriteAsync(dataEditor.EditDatalog(HttpContext));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/edit: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -247,13 +247,13 @@ public async Task GetData(string req)
 								await writer.WriteAsync(Station.GetDiarySummary());
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/data: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -286,15 +286,15 @@ public async Task PostTags(string req)
 								await writer.WriteAsync(tagProcessor.ProcessText(HttpContext.Request));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/tags: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -322,14 +322,14 @@ public async Task GetTags(string req)
 								await writer.WriteAsync(tagProcessor.ProcessJson(Request));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/tags: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -403,13 +403,13 @@ public async Task GetGraphData(string req)
 								await writer.WriteAsync(Station.GetSelectaChartOptions());
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/graphdata: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -437,15 +437,15 @@ public async Task SetGraphData(string req)
 								await writer.WriteAsync(stationSettings.SetSelectaChartOptions(HttpContext));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/graphdata: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -481,9 +481,9 @@ public async Task GetDailyGraphData(string req)
 							case "pressdata.json":
 								await writer.WriteAsync(Station.GetAllDailyPressGraphData());
 								break;
-							//case "wdirdata.json":
-							//await writer.WriteAsync(Station.GetAllDailyWindDirGraphData());
-							//break;
+							case "wdirdata.json":
+								await writer.WriteAsync(Station.GetAllDailyWindDirGraphData());
+								break;
 							case "humdata.json":
 								await writer.WriteAsync(Station.GetAllDailyHumGraphData());
 								break;
@@ -503,14 +503,14 @@ public async Task GetDailyGraphData(string req)
 								await writer.WriteAsync(Station.GetGraphConfig());
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/dailygraphdata: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -553,14 +553,14 @@ public async Task GetAlltimeData(string req)
 								await writer.WriteAsync(EscapeUnicode(Station.GetRainRecords()));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/records/alltime: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -608,14 +608,14 @@ public async Task GetMonthlyRecordData(string mon, string req)
 								await writer.WriteAsync(EscapeUnicode(Station.GetMonthlyRainRecords(month)));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/records/month: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -655,14 +655,14 @@ public async Task GetThisMonthRecordData(string req)
 								await writer.WriteAsync(EscapeUnicode(Station.GetThisMonthRainRecords()));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/records/thismonth: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -701,14 +701,14 @@ public async Task GetThisYearRecordData(string req)
 								await writer.WriteAsync(EscapeUnicode(Station.GetThisYearRainRecords()));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/records/thisyear: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -755,14 +755,14 @@ public async Task GetYesterdayData(string req)
 								await writer.WriteAsync(Station.GetTodayYestSolar());
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/todayyest: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -847,14 +847,14 @@ public async Task GetExtraData(string req)
 								await writer.WriteAsync(Station.GetCO2sensor());
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/extra: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -940,14 +940,14 @@ public async Task SettingsGet(string req)
 								await writer.WriteAsync(wizard.GetAlpacaFormData());
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/settings: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -1012,14 +1012,14 @@ public async Task SettingsSet(string req)
 								await writer.WriteAsync(wizard.UpdateConfig(HttpContext));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/setsettings: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -1034,13 +1034,10 @@ public async Task GetData(string req)
 				NOAAReports noaarpts = new NOAAReports(Program.cumulus);
 				try
 				{
-					// read the last segment of the URL to determine what data the caller wants
-					var lastSegment = Request.Url.Segments.Last();
-
 					var query = HttpUtility.ParseQueryString(Request.Url.Query);
 					int month, year;
 
-					Response.ContentType = "application/json";
+					Response.ContentType = "text/plain";
 
 					using (var writer = HttpContext.OpenResponseText())
 					{
@@ -1055,7 +1052,7 @@ public async Task GetData(string req)
 						switch (req)
 						{
 							case "noaayear":
-								await writer.WriteAsync(Json.Serialize(noaarpts.GetNoaaYearReport(year)));
+								await writer.WriteAsync(String.Join("\n", noaarpts.GetNoaaYearReport(year).ToArray()));
 								break;
 							case "noaamonth":
 								if (!Int32.TryParse(query["month"], out month) || month < 1 || month > 12)
@@ -1064,17 +1061,17 @@ public async Task GetData(string req)
 									Response.StatusCode = 406;
 									return;
 								}
-								await writer.WriteAsync(Json.Serialize(noaarpts.GetNoaaMonthReport(year, month)));
+								await writer.WriteAsync(String.Join("\n", noaarpts.GetNoaaMonthReport(year, month).ToArray()));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/reports: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -1087,7 +1084,7 @@ public async Task GenReports(string req)
 				{
 					var query = HttpUtility.ParseQueryString(Request.Url.Query);
 					int month, year;
-					Response.ContentType = "application/json";
+					Response.ContentType = "text/plain";
 
 					using (var writer = HttpContext.OpenResponseText())
 					{
@@ -1101,7 +1098,7 @@ public async Task GenReports(string req)
 						switch (req)
 						{
 							case "noaayear":
-								await writer.WriteAsync(Json.Serialize(noaarpts.GenerateNoaaYearReport(year)));
+								await writer.WriteAsync(String.Join("\n", noaarpts.GenerateNoaaYearReport(year).ToArray()));
 								break;
 							case "noaamonth":
 								if (!Int32.TryParse(query["month"], out month) || month < 1 || month > 12)
@@ -1110,18 +1107,21 @@ public async Task GenReports(string req)
 									Response.StatusCode = 406;
 									return;
 								}
-								await writer.WriteAsync(Json.Serialize(noaarpts.GenerateNoaaMonthReport(year, month)));
+								await writer.WriteAsync(String.Join("\n", noaarpts.GenerateNoaaMonthReport(year, month).ToArray()));
 								break;
 							default:
-								throw new KeyNotFoundException("Key Not Found: " + req);
+								Response.StatusCode = 404;
+								throw new Exception();
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					//using (var writer = HttpContext.OpenResponseText())
+					//	await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
 					Response.StatusCode = 500;
+					Program.cumulus.LogMessage($"api/genreports: Unexpected Error, ErrorCode: {ex.GetType().Name}, Description: \"{ex.Message}\"");
 				}
 			}
 		}
@@ -1162,13 +1162,15 @@ public async Task PostTags(string req)
 									await writer.WriteAsync("{\"Error\":\"HTTP Station (Ecowitt) is not running}\"");
 								}
 								break;
+							default:
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/httpstation: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
@@ -1220,13 +1222,15 @@ public async Task GetStation(string req)
 									await writer.WriteAsync("HTTP Station (Ambient) is not running");
 								}
 								break;
+							default:
+								Response.StatusCode = 404;
+								break;
 						}
 					}
 				}
 				catch (Exception ex)
 				{
-					using (var writer = HttpContext.OpenResponseText())
-						await writer.WriteAsync($"{{\"Title\":\"Unexpected Error\",\"ErrorCode\":\"{ex.GetType().Name}\",\"Description\":\"{ex.Message}\"}}");
+					Program.cumulus.LogMessage($"api/httpstation: Unexpected Error, Description: \"{ex.Message}\"");
 					Response.StatusCode = 500;
 				}
 			}
diff --git a/CumulusMX/ApiTagProcessor.cs b/CumulusMX/ApiTagProcessor.cs
index 35003543..c4ef777f 100644
--- a/CumulusMX/ApiTagProcessor.cs
+++ b/CumulusMX/ApiTagProcessor.cs
@@ -67,7 +67,7 @@ public string ProcessJson(IHttpRequest request)
 					// remove trailing ","
 					output.Remove(output.Length - 1, 1);
 				}
-				output.Append("}");
+				output.Append('}');
 
 				cumulus.LogDataMessage("API tag: Output string = " + output);
 			}
diff --git a/CumulusMX/App.config b/CumulusMX/App.config
index 6996fdc6..3ae0a98a 100644
--- a/CumulusMX/App.config
+++ b/CumulusMX/App.config
@@ -4,6 +4,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
   <runtime>
+	<GCConserveMemory enabled="6"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 		<dependentAssembly>
 			<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -25,6 +26,10 @@
 			<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
 			<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
 		</dependentAssembly>
-	</assemblyBinding>
+	  <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/CumulusMX/Cumulus.cs b/CumulusMX/Cumulus.cs
index 2aa1c65e..64ab61d2 100644
--- a/CumulusMX/Cumulus.cs
+++ b/CumulusMX/Cumulus.cs
@@ -18,7 +18,6 @@
 using MySqlConnector;
 using FluentFTP;
 using FluentFTP.Helpers;
-using LinqToTwitter;
 using ServiceStack.Text;
 using EmbedIO;
 using EmbedIO.WebApi;
@@ -466,9 +465,6 @@ public struct TExtraFiles
 		//private const int VP2USBCONNECTION = 1;
 		//private const int VP2TCPIPCONNECTION = 2;
 
-		private readonly string twitterKey = "lQiGNdtlYUJ4wS3d7souPw";
-		private readonly string twitterSecret = "AoB7OqimfoaSfGQAd47Hgatqdv3YeTTiqpinkje6Xg";
-
 		public string AlltimeIniFile;
 		public string Alltimelogfile;
 		public string MonthlyAlltimeIniFile;
@@ -545,9 +541,6 @@ public struct TExtraFiles
 		public bool RealtimeIntervalEnabled; // The timer is to be started
 		private int realtimeFTPRetries; // Count of failed realtime FTP attempts
 
-		// Twitter settings
-		public WebUploadTwitter Twitter = new WebUploadTwitter();
-
 		// Wunderground settings
 		public WebUploadWund Wund = new WebUploadWund();
 
@@ -770,7 +763,6 @@ public Cumulus(int HTTPport, bool DebugEnabled, string startParms)
 			DirectorySeparator = Path.DirectorySeparatorChar;
 
 			AppDir = Directory.GetCurrentDirectory() + DirectorySeparator;
-			TwitterTxtFile = AppDir + "twitter.txt";
 			WebTagFile = AppDir + "WebTags.txt";
 
 			//b3045>, use same port for WS...  WS port = HTTPS port
@@ -1107,7 +1099,7 @@ public Cumulus(int HTTPport, bool DebugEnabled, string startParms)
 			if (ProgramOptions.StartupDelaySecs > 0)
 			{
 				// Check uptime
-				double ts = 0;
+				double ts = -1;
 				if (Platform.Substring(0, 3) == "Win" && UpTime != null)
 				{
 					UpTime.NextValue();
@@ -1121,7 +1113,7 @@ public Cumulus(int HTTPport, bool DebugEnabled, string startParms)
 				}
 
 				// Only delay if the delay uptime is undefined (0), or the current uptime is less than the user specified max uptime to apply the delay
-				LogMessage($"System uptime = {(int)ts} secs");
+				LogMessage($"System uptime = {ts:F0} secs");
 				if (ProgramOptions.StartupDelayMaxUptime == 0 || (ts > -1 && ProgramOptions.StartupDelayMaxUptime > ts))
 				{
 					var msg1 = $"Delaying start for {ProgramOptions.StartupDelaySecs} seconds";
@@ -1709,6 +1701,9 @@ public Cumulus(int HTTPport, bool DebugEnabled, string startParms)
 					station.StartLoop();
 				}
 
+				// let the web socket know about the station
+				WebSock.SetStation = station;
+
 				// If enabled generate the daily graph data files, and upload at first opportunity
 				LogDebugMessage("Generating the daily graph data files");
 				station.CreateEodGraphDataFiles();
@@ -2160,103 +2155,6 @@ private void WebTimerTick(object sender, ElapsedEventArgs e)
 			}
 		}
 
-		internal async void UpdateTwitter()
-		{
-			if (station.DataStopped)
-			{
-				// No data coming in, do nothing
-				return;
-			}
-
-			LogDebugMessage("Starting Twitter update");
-			var auth = new XAuthAuthorizer
-			{
-				CredentialStore = new XAuthCredentials { ConsumerKey = twitterKey, ConsumerSecret = twitterSecret, UserName = Twitter.ID, Password = Twitter.PW }
-			};
-
-			if (Twitter.OauthToken == "unknown")
-			{
-				// need to get tokens using xauth
-				LogDebugMessage("Obtaining Twitter tokens");
-				await auth.AuthorizeAsync();
-
-				Twitter.OauthToken = auth.CredentialStore.OAuthToken;
-				Twitter.OauthTokenSecret = auth.CredentialStore.OAuthTokenSecret;
-				//LogDebugMessage("Token=" + TwitterOauthToken);
-				//LogDebugMessage("TokenSecret=" + TwitterOauthTokenSecret);
-				LogDebugMessage("Tokens obtained");
-			}
-			else
-			{
-				auth.CredentialStore.OAuthToken = Twitter.OauthToken;
-				auth.CredentialStore.OAuthTokenSecret = Twitter.OauthTokenSecret;
-			}
-
-			using (var twitterCtx = new TwitterContext(auth))
-			{
-				StringBuilder status = new StringBuilder(1024);
-
-				if (File.Exists(TwitterTxtFile))
-				{
-					// use twitter.txt file
-					LogDebugMessage("Using twitter.txt file");
-					var twitterTokenParser = new TokenParser();
-					var utf8WithoutBom = new UTF8Encoding(false);
-					var encoding = utf8WithoutBom;
-					twitterTokenParser.Encoding = encoding;
-					twitterTokenParser.SourceFile = TwitterTxtFile;
-					twitterTokenParser.OnToken += TokenParserOnToken;
-					status.Append(twitterTokenParser);
-				}
-				else
-				{
-					// default message
-					status.Append($"Wind {station.WindAverage.ToString(WindAvgFormat)} {Units.WindText} {station.AvgBearingText}.");
-					status.Append($" Barometer {station.Pressure.ToString(PressFormat)} {Units.PressText}, {station.Presstrendstr}.");
-					status.Append($" Temperature {station.OutdoorTemperature.ToString(TempFormat)} {Units.TempText}.");
-					status.Append($" Rain today {station.RainToday.ToString(RainFormat)}{Units.RainText}.");
-					status.Append($" Humidity {station.OutdoorHumidity}%");
-				}
-
-				LogDebugMessage($"Updating Twitter: {status}");
-
-				var statusStr = status.ToString();
-
-				try
-				{
-					Status tweet;
-
-					if (Twitter.SendLocation)
-					{
-						tweet = await twitterCtx.TweetAsync(statusStr, (decimal)Latitude, (decimal)Longitude);
-					}
-					else
-					{
-						tweet = await twitterCtx.TweetAsync(statusStr);
-					}
-
-					if (tweet == null)
-					{
-						LogDebugMessage("Null Twitter response");
-					}
-					else
-					{
-						LogDebugMessage($"Status returned: ({tweet.StatusID}) {tweet.User.Name}, {tweet.Text}, {tweet.CreatedAt}");
-					}
-
-					HttpUploadAlarm.Triggered = false;
-				}
-				catch (Exception ex)
-				{
-					LogMessage($"UpdateTwitter: {ex.Message}");
-					HttpUploadAlarm.LastError = "Twitter: " + ex.Message;
-					HttpUploadAlarm.Triggered = true;
-				}
-				//if (tweet != null)
-				//    Console.WriteLine("Status returned: " + "(" + tweet.StatusID + ")" + tweet.User.Name + ", " + tweet.Text + "\n");
-			}
-		}
-
 		private void WundTimerTick(object sender, ElapsedEventArgs e)
 		{
 			if (!string.IsNullOrWhiteSpace(Wund.ID))
@@ -4026,6 +3924,7 @@ private void ReadIniFile()
 			StationOptions.Humidity98Fix = ini.GetValue("Station", "Humidity98Fix", false);
 			StationOptions.UseWind10MinAvg = ini.GetValue("Station", "Wind10MinAverage", false);
 			StationOptions.UseSpeedForAvgCalc = ini.GetValue("Station", "UseSpeedForAvgCalc", false);
+			StationOptions.UseSpeedForLatest = ini.GetValue("Station", "UseSpeedForLatest", false);
 
 			StationOptions.AvgBearingMinutes = ini.GetValue("Station", "AvgBearingMinutes", 10);
 			if (StationOptions.AvgBearingMinutes > 120)
@@ -4655,19 +4554,6 @@ private void ReadIniFile()
 			WCloud.SendLeafWetness = ini.GetValue("WeatherCloud", "SendLeafWetness", false);
 			WCloud.LeafWetnessSensor = ini.GetValue("WeatherCloud", "LeafWetnessSensor", 1);
 
-			Twitter.ID = ini.GetValue("Twitter", "User", "");
-			Twitter.PW = ini.GetValue("Twitter", "Password", "");
-			Twitter.Enabled = ini.GetValue("Twitter", "Enabled", false);
-			Twitter.Interval = ini.GetValue("Twitter", "Interval", 60);
-			if (Twitter.Interval < 1)
-			{
-				Twitter.Interval = 1;
-				rewriteRequired = true;
-			}
-			Twitter.OauthToken = ini.GetValue("Twitter", "OauthToken", "unknown");
-			Twitter.OauthTokenSecret = ini.GetValue("Twitter", "OauthTokenSecret", "unknown");
-			Twitter.SendLocation = ini.GetValue("Twitter", "SendLocation", true);
-
 			//if HTTPLogging then
 			//  MainForm.WUHTTP.IcsLogger = MainForm.HTTPlogger;
 
@@ -5672,14 +5558,6 @@ internal void WriteIniFile()
 			ini.SetValue("WeatherCloud", "SendLeafWetness", WCloud.SendLeafWetness);
 			ini.SetValue("WeatherCloud", "LeafWetnessSensor", WCloud.LeafWetnessSensor);
 
-			ini.SetValue("Twitter", "User", Twitter.ID);
-			ini.SetValue("Twitter", "Password", Twitter.PW);
-			ini.SetValue("Twitter", "Enabled", Twitter.Enabled);
-			ini.SetValue("Twitter", "Interval", Twitter.Interval);
-			ini.SetValue("Twitter", "OauthToken", Twitter.OauthToken);
-			ini.SetValue("Twitter", "OauthTokenSecret", Twitter.OauthTokenSecret);
-			ini.SetValue("Twitter", "TwitterSendLocation", Twitter.SendLocation);
-
 			ini.SetValue("PWSweather", "ID", PWS.ID);
 			ini.SetValue("PWSweather", "Password", PWS.PW);
 			ini.SetValue("PWSweather", "Enabled", PWS.Enabled);
@@ -6700,7 +6578,6 @@ private void ReadStringsFile()
 		public DateTime defaultRecordTS = DateTime.MinValue;
 		public string WxnowFile = "wxnow.txt";
 		private readonly string RealtimeFile = "realtime.txt";
-		private readonly string TwitterTxtFile;
 		private readonly FtpClient RealtimeFTP = new FtpClient();
 		private SftpClient RealtimeSSH;
 		private volatile bool RealtimeFtpInProgress;
@@ -7061,7 +6938,7 @@ public async void DoLogFile(DateTime timestamp, bool live)
 				values.Append(station.CompassPoint(station.Bearing) + "',");
 				values.Append(station.FeelsLike.ToString(TempFormat, InvC) + ",");
 				values.Append(station.Humidex.ToString(TempFormat, InvC));
-				values.Append(")");
+				values.Append(')');
 
 				string queryString = values.ToString();
 
@@ -7371,7 +7248,7 @@ public async void DoAirLinkLogFile(DateTime timestamp)
 				{
 					sb.Append("0" + ListSeparator);
 				}
-				sb.Append("0");
+				sb.Append('0');
 			}
 
 			var success = false;
@@ -8333,8 +8210,6 @@ public void DoFTPLogin()
 							}
 
 							// Extra files
-							LogFtpDebugMessage("SFTP[Int]: Uploading extra files");
-							var cnt = 0;
 							for (int i = 0; i < numextrafiles; i++)
 							{
 								var uploadfile = ExtraFiles[i].local;
@@ -8353,7 +8228,8 @@ public void DoFTPLogin()
 
 									if (File.Exists(uploadfile))
 									{
-										cnt++;
+										LogFtpDebugMessage("FTP[Int]: Uploading Extra file: " + uploadfile);
+
 										remotefile = GetRemoteFileName(remotefile, logDay);
 
 										// all checks OK, file needs to be uploaded
@@ -8383,20 +8259,18 @@ public void DoFTPLogin()
 							{
 								EODfilesNeedFTP = false;
 							}
-							LogFtpDebugMessage($"SFTP[Int]: Done uploading {cnt} extra files");
 
 							// standard files
-							LogFtpDebugMessage("SFTP[Int]: Uploading standard web files");
-							cnt = 0;
 							for (var i = 0; i < StdWebFiles.Length; i++)
 							{
 								if (StdWebFiles[i].FTP && StdWebFiles[i].FtpRequired)
 								{
 									try
 									{
-										cnt++;
 										var localFile = StdWebFiles[i].LocalPath + StdWebFiles[i].LocalFileName;
 										var remotefile = remotePath + StdWebFiles[i].RemoteFileName;
+										LogFtpDebugMessage("FTP[Int]: Uploading standard Data file: " + localFile);
+
 										UploadFile(conn, localFile, remotefile, -1);
 									}
 									catch (Exception e)
@@ -8406,9 +8280,6 @@ public void DoFTPLogin()
 									}
 								}
 							}
-							LogFtpDebugMessage($"SFTP[Int]: Done uploading {0} standard web files");
-
-							LogFtpDebugMessage("SFTP[Int]: Uploading graph data files");
 
 							for (int i = 0; i < GraphDataFiles.Length; i++)
 							{
@@ -8419,6 +8290,8 @@ public void DoFTPLogin()
 
 									try
 									{
+										LogFtpDebugMessage("FTP[Int]: Uploading graph data file: " + uploadfile);
+
 										UploadFile(conn, uploadfile, remotefile, -1);
 										// The config files only need uploading once per change
 										if (GraphDataFiles[i].LocalFileName == "availabledata.json" ||
@@ -8434,19 +8307,17 @@ public void DoFTPLogin()
 									}
 								}
 							}
-							LogFtpDebugMessage("SFTP[Int]: Done uploading graph data files");
 
-							LogFtpMessage("SFTP[Int]: Uploading daily graph data files");
-							cnt = 0;
 							for (int i = 0; i < GraphDataEodFiles.Length; i++)
 							{
 								if (GraphDataEodFiles[i].FTP && GraphDataEodFiles[i].FtpRequired)
 								{
-									cnt++;
 									var uploadfile = GraphDataEodFiles[i].LocalPath + GraphDataEodFiles[i].LocalFileName;
 									var remotefile = remotePath + GraphDataEodFiles[i].RemoteFileName;
 									try
 									{
+										LogFtpMessage("FTP[Int]: Uploading daily graph data file: " + uploadfile);
+
 										UploadFile(conn, uploadfile, remotefile, -1);
 										// Uploaded OK, reset the upload required flag
 										GraphDataEodFiles[i].FtpRequired = false;
@@ -8458,7 +8329,6 @@ public void DoFTPLogin()
 									}
 								}
 							}
-							LogFtpMessage($"SFTP[Int]: Done uploading {cnt} daily graph data files");
 
 							if (MoonImage.Ftp && MoonImage.ReadyToFtp)
 							{
@@ -9163,7 +9033,7 @@ public void MySqlRealtimeFile(int cycle, bool live, DateTime? logdate = null)
 			values.Append(((int)Math.Round(station.CurrentSolarMax)).ToString() + ",'");
 			values.Append((station.IsSunny ? "1" : "0") + "',");
 			values.Append(station.FeelsLike.ToString(TempFormat, InvC));
-			values.Append(")");
+			values.Append(')');
 
 			string valuesString = values.ToString();
 			List<string> cmds = new List<string>() { valuesString };
@@ -9657,6 +9527,10 @@ private void RealtimeFTPLogin()
 				RealtimeFTP.DataConnectionType = FtpDataConnectionType.PASV;
 				LogDebugMessage("RealtimeFTPLogin: Disabling EPSV mode");
 			}
+			else
+			{
+				RealtimeFTP.DataConnectionType = FtpDataConnectionType.EPSV;
+			}
 
 			if (FtpOptions.Enabled)
 			{
@@ -10743,6 +10617,7 @@ public class StationOptions
 		public bool UseZeroBearing { get; set; }
 		public bool UseWind10MinAvg { get; set; }
 		public bool UseSpeedForAvgCalc { get; set; }
+		public bool UseSpeedForLatest { get; set; }
 		public bool Humidity98Fix { get; set; }
 		public bool CalculatedDP { get; set; }
 		public bool CalculatedWC { get; set; }
@@ -11043,13 +10918,6 @@ public class WebUploadService
 		public bool Updating;
 	}
 
-	public class WebUploadTwitter : WebUploadService
-	{
-		public string OauthToken;
-		public string OauthTokenSecret;
-		public bool SendLocation;
-	}
-
 	public class WebUploadWund : WebUploadService
 	{
 		public bool RapidFireEnabled;
diff --git a/CumulusMX/CumulusMX.csproj b/CumulusMX/CumulusMX.csproj
index 9efb51fb..666dd0a7 100644
--- a/CumulusMX/CumulusMX.csproj
+++ b/CumulusMX/CumulusMX.csproj
@@ -11,7 +11,8 @@
     <AssemblyName>CumulusMX</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>8de6c3ed</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
     <PublishUrl>C:\Users\mcrossley\Code\CumulusMX-Dist\</PublishUrl>
@@ -102,28 +103,20 @@
     <Reference Include="HidSharp, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\HidSharp.2.1.0\lib\net35\HidSharp.dll</HintPath>
     </Reference>
-    <Reference Include="LinqToTwitter.AspNet, Version=3.1.1.15391, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\linqtotwitter.3.1.1\lib\net45\LinqToTwitter.AspNet.dll</HintPath>
-    </Reference>
-    <Reference Include="LinqToTwitterPcl, Version=3.1.1.15391, Culture=neutral, PublicKeyToken=957107be965c25d9, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\linqtotwitter.3.1.1\lib\net45\LinqToTwitterPcl.dll</HintPath>
-    </Reference>
-    <Reference Include="MailKit, Version=3.2.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
-      <HintPath>..\packages\MailKit.3.2.0\lib\net48\MailKit.dll</HintPath>
+    <Reference Include="MailKit, Version=3.3.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
+      <HintPath>..\packages\MailKit.3.3.0\lib\net48\MailKit.dll</HintPath>
     </Reference>
-    <Reference Include="MimeKit, Version=3.2.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
-      <HintPath>..\packages\MimeKit.3.2.0\lib\net48\MimeKit.dll</HintPath>
+    <Reference Include="MimeKit, Version=3.3.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
+      <HintPath>..\packages\MimeKit.3.3.0\lib\net48\MimeKit.dll</HintPath>
     </Reference>
-    <Reference Include="MQTTnet, Version=3.1.2.0, Culture=neutral, PublicKeyToken=b69712f52770c0a7, processorArchitecture=MSIL">
-      <HintPath>..\packages\MQTTnet.3.1.2\lib\net461\MQTTnet.dll</HintPath>
+    <Reference Include="MQTTnet, Version=4.0.1.184, Culture=neutral, PublicKeyToken=fdb7629f2e364a63, processorArchitecture=MSIL">
+      <HintPath>..\packages\MQTTnet.4.0.1.184\lib\net461\MQTTnet.dll</HintPath>
     </Reference>
     <Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySqlConnector.2.1.9\lib\net471\MySqlConnector.dll</HintPath>
+      <HintPath>..\packages\MySqlConnector.2.1.10\lib\net471\MySqlConnector.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2020.0.1.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2020.0.1\lib\net40\Renci.SshNet.dll</HintPath>
+    <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
       <HintPath>..\packages\ServiceStack.Text.6.1.0\lib\net472\ServiceStack.Text.dll</HintPath>
@@ -143,16 +136,10 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http.WebRequest">
       <Private>False</Private>
     </Reference>
@@ -296,13 +283,6 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/CumulusMX/DataEditor.cs b/CumulusMX/DataEditor.cs
index 8b23f741..569e970a 100644
--- a/CumulusMX/DataEditor.cs
+++ b/CumulusMX/DataEditor.cs
@@ -233,7 +233,7 @@ internal string GetAllTimeRecData()
 			json.Append($"\"highMonthlyRainTime\":\"{station.AllTime.MonthlyRain.GetTsString("MM/yyyy")}\",");
 			json.Append($"\"longestDryPeriodTime\":\"{station.AllTime.LongestDryPeriod.GetTsString(dateStampFormat)}\",");
 			json.Append($"\"longestWetPeriodTime\":\"{station.AllTime.LongestWetPeriod.GetTsString(dateStampFormat)}\"");
-			json.Append("}");
+			json.Append('}');
 
 			return json.ToString();
 		}
@@ -1651,7 +1651,7 @@ internal string GetMonthlyRecData()
 				json.Append($"\"{m}-longestWetPeriodTime\":\"{station.MonthlyRecs[m].LongestWetPeriod.GetTsString(dateStampFormat)}\",");
 			}
 			json.Length--;
-			json.Append("}");
+			json.Append('}');
 
 			return json.ToString();
 		}
@@ -2582,7 +2582,7 @@ internal string GetMonthlyRecLogFile()
 			}
 
 			json.Length--;
-			json.Append("}");
+			json.Append('}');
 
 			watch.Stop();
 			var elapsed = watch.ElapsedMilliseconds;
diff --git a/CumulusMX/DavisAirLink.cs b/CumulusMX/DavisAirLink.cs
index 5a664ac3..bb5f3451 100644
--- a/CumulusMX/DavisAirLink.cs
+++ b/CumulusMX/DavisAirLink.cs
@@ -672,9 +672,9 @@ private void GetWlHistoricData()
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				historicUrl.Append(entry.Key);
-				historicUrl.Append("=");
+				historicUrl.Append('=');
 				historicUrl.Append(entry.Value);
-				historicUrl.Append("&");
+				historicUrl.Append('&');
 			}
 			// remove the trailing "&"
 			historicUrl.Remove(historicUrl.Length - 1, 1);
@@ -1114,9 +1114,9 @@ private void GetWlHistoricHealth()
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				historicUrl.Append(entry.Key);
-				historicUrl.Append("=");
+				historicUrl.Append('=');
 				historicUrl.Append(entry.Value);
-				historicUrl.Append("&");
+				historicUrl.Append('&');
 			}
 			// remove the trailing "&"
 			historicUrl.Remove(historicUrl.Length - 1, 1);
@@ -1379,9 +1379,9 @@ private bool GetAvailableStationIds()
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				stationsUrl.Append(entry.Key);
-				stationsUrl.Append("=");
+				stationsUrl.Append('=');
 				stationsUrl.Append(entry.Value);
-				stationsUrl.Append("&");
+				stationsUrl.Append('&');
 			}
 			// remove the trailing "&"
 			stationsUrl.Remove(stationsUrl.Length - 1, 1);
@@ -1498,9 +1498,9 @@ private void GetAvailableSensors()
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				sensorsUrl.Append(entry.Key);
-				sensorsUrl.Append("=");
+				sensorsUrl.Append('=');
 				sensorsUrl.Append(entry.Value);
-				sensorsUrl.Append("&");
+				sensorsUrl.Append('&');
 			}
 			// remove the trailing "&"
 			sensorsUrl.Remove(sensorsUrl.Length - 1, 1);
diff --git a/CumulusMX/DavisWllStation.cs b/CumulusMX/DavisWllStation.cs
index 64bcfd69..a1601ae2 100644
--- a/CumulusMX/DavisWllStation.cs
+++ b/CumulusMX/DavisWllStation.cs
@@ -28,7 +28,7 @@ internal class DavisWllStation : WeatherStation
 		private readonly System.Timers.Timer tmrBroadcastWatchdog;
 		private readonly System.Timers.Timer tmrHealth;
 		private readonly object threadSafer = new object();
-		private static readonly SemaphoreSlim WebReq = new SemaphoreSlim(1);
+		private static readonly SemaphoreSlim WebReq = new SemaphoreSlim(1, 1);
 		private bool startupDayResetIfRequired = true;
 		private bool savedUseSpeedForAvgCalc;
 		private bool savedCalculatePeakGust;
@@ -47,6 +47,8 @@ internal class DavisWllStation : WeatherStation
 		private readonly List<WlSensor> sensorList = new List<WlSensor>();
 		private readonly bool useWeatherLinkDotCom = true;
 
+		private static byte[] broadcastBuffer = new byte[8192];
+
 		public DavisWllStation(Cumulus cumulus) : base(cumulus)
 		{
 			calculaterainrate = false;
@@ -100,7 +102,7 @@ public DavisWllStation(Cumulus cumulus) : base(cumulus)
 
 			// used for kicking real time, and getting current conditions
 			dogsBodyClient.Timeout = TimeSpan.FromSeconds(10); // 10 seconds for local queries
-			dogsBodyClient.DefaultRequestHeaders.Add("Connection", "close");
+			//dogsBodyClient.DefaultRequestHeaders.Add("Connection", "keep-alive"); - No persistent connections on the WLL
 
 			// The Davis leafwetness sensors send a decimal value via WLL (only integer available via VP2/Vue)
 			cumulus.LeafWetDPlaces = 1;
@@ -301,12 +303,12 @@ public override void Start()
 								// test is any data is available
 								if (udpClient.Client.Available > 0)
 								{
-									var jsonBtye = udpClient.Receive(ref from);
-									var jsonStr = Encoding.UTF8.GetString(jsonBtye);
+									broadcastBuffer = udpClient.Receive(ref from);
+									var jsonStr = Encoding.UTF8.GetString(broadcastBuffer);
 									DecodeBroadcast(jsonStr);
 								}
 								// if not, sleep and repeat, or exit on cancel
-								else if (cancellationToken.WaitHandle.WaitOne(200))
+								else if (cancellationToken.WaitHandle.WaitOne(100))
 								{
 									cumulus.LogMessage("WLL broadcast listener stop requested");
 									break;
@@ -403,7 +405,7 @@ private async void GetWllRealtime(object source, ElapsedEventArgs e)
 			var retry = 2;
 
 			//cumulus.LogDebugMessage("GetWllRealtime: GetWllRealtime waiting for lock");
-			WebReq.Wait();
+			await WebReq.WaitAsync();
 			//cumulus.LogDebugMessage("GetWllRealtime: GetWllRealtime has the lock");
 
 			// The WLL will error if already responding to a request from another device, so add a retry
@@ -483,11 +485,15 @@ private async void GetWllCurrent(object source, ElapsedEventArgs e)
 			{
 				var urlCurrent = $"http://{ip}/v1/current_conditions";
 
-				// wait a random time of 0 to 5 seconds before making the request to try and avoid continued clashes with other software or instances of MX
-				await Task.Delay(random.Next(0, 5000));
+				if (DateTime.Now.Subtract(LastDataReadTimestamp).TotalSeconds > 2.1)
+				{
+					// Another brodcast is due, half a second or so
+					cumulus.LogDebugMessage("GetWllCurrent: Delaying");
+					await Task.Delay(600);
+				}
 
 				//cumulus.LogDebugMessage("GetWllCurrent: Waiting for lock");
-				WebReq.Wait();
+				await WebReq.WaitAsync();
 				//cumulus.LogDebugMessage("GetWllCurrent: Has the lock");
 
 				// The WLL will error if already responding to a request from another device, so add a retry
@@ -514,13 +520,21 @@ private async void GetWllCurrent(object source, ElapsedEventArgs e)
 					}
 					catch (Exception ex)
 					{
+						// less chatty, only ouput the error on the third attempt
+						if (retry == 3)
+						{
+							cumulus.LogMessage("GetWllCurrent: Error processing WLL response");
+							if (ex.InnerException == null)
+								cumulus.LogMessage($"GetWllCurrent: Error: {ex.Message}");
+							else
+								cumulus.LogMessage($"GetWllCurrent: Error: {ex.InnerException.Message}");
+						}
 						retry++;
-						cumulus.LogMessage("GetWllCurrent: Error processing WLL response");
-						if (ex.InnerException == null)
-							cumulus.LogMessage($"GetWllCurrent: Error: {ex.Message}");
-						else
-							cumulus.LogMessage($"GetWllCurrent: Error: {ex.InnerException.Message}");
+
+						// also shift the timer by a second
+						tmrCurrent.Stop();
 						Thread.Sleep(1000);
+						tmrCurrent.Start();
 					}
 				} while (retry < 3);
 
@@ -1568,9 +1582,9 @@ private void GetWlHistoricData(BackgroundWorker worker)
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				historicUrl.Append(entry.Key);
-				historicUrl.Append("=");
+				historicUrl.Append('=');
 				historicUrl.Append(entry.Value);
-				historicUrl.Append("&");
+				historicUrl.Append('&');
 			}
 			// remove the trailing "&"
 			historicUrl.Remove(historicUrl.Length - 1, 1);
@@ -2915,9 +2929,9 @@ private void GetWlHistoricHealth()
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				historicUrl.Append(entry.Key);
-				historicUrl.Append("=");
+				historicUrl.Append('=');
 				historicUrl.Append(entry.Value);
-				historicUrl.Append("&");
+				historicUrl.Append('&');
 			}
 			// remove the trailing "&"
 			historicUrl.Remove(historicUrl.Length - 1, 1);
@@ -3094,9 +3108,9 @@ private void GetAvailableStationIds(bool logToConsole = false)
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				stationsUrl.Append(entry.Key);
-				stationsUrl.Append("=");
+				stationsUrl.Append('=');
 				stationsUrl.Append(entry.Value);
-				stationsUrl.Append("&");
+				stationsUrl.Append('&');
 			}
 			// remove the trailing "&"
 			stationsUrl.Remove(stationsUrl.Length - 1, 1);
@@ -3207,9 +3221,9 @@ private void GetAvailableSensors()
 			foreach (KeyValuePair<string, string> entry in parameters)
 			{
 				stationsUrl.Append(entry.Key);
-				stationsUrl.Append("=");
+				stationsUrl.Append('=');
 				stationsUrl.Append(entry.Value);
-				stationsUrl.Append("&");
+				stationsUrl.Append('&');
 			}
 			// remove the trailing "&"
 			stationsUrl.Remove(stationsUrl.Length - 1, 1);
diff --git a/CumulusMX/ExtraSensorSettings.cs b/CumulusMX/ExtraSensorSettings.cs
index f659d169..58911686 100644
--- a/CumulusMX/ExtraSensorSettings.cs
+++ b/CumulusMX/ExtraSensorSettings.cs
@@ -519,11 +519,11 @@ public class JsonExtraSensorAmbient
 
 	public class JsonExtraSensorEcowitt : JsonExtraSensorAmbient
 	{
-		internal bool setcustom { get; set; }
-		internal string gwaddr { get; set; }
-		internal string localaddr { get; set; }
-		internal int interval { get; set; }
-		internal JsonStationSettingsEcowittMappings mappings { get; set; }
+		public bool setcustom { get; set; }
+		public string gwaddr { get; set; }
+		public string localaddr { get; set; }
+		public int interval { get; set; }
+		public JsonStationSettingsEcowittMappings mappings { get; set; }
 	}
 
 
diff --git a/CumulusMX/FOStation.cs b/CumulusMX/FOStation.cs
index ae79b040..0443af6f 100644
--- a/CumulusMX/FOStation.cs
+++ b/CumulusMX/FOStation.cs
@@ -24,9 +24,9 @@ internal class FOStation : WeatherStation
 		private int prevaddr = -1;
 		private int prevraintotal = -1;
 		private int ignoreraincount;
-		private int synchroPhase;
 		private DateTime previousSensorClock;
 		private DateTime previousStationClock;
+		private DateTime previousSolarClock;
 		private bool synchronising;
 		//private DateTime lastraintip;
 		//private int raininlasttip = 0;
@@ -34,7 +34,7 @@ internal class FOStation : WeatherStation
 		private readonly Timer tmrDataRead;
 		private int readCounter;
 		private bool hadfirstsyncdata;
-		private readonly byte[] prevdata = new byte[16];
+		private readonly byte[] prevdata = new byte[20];
 		private readonly int foEntrysize;
 		private readonly int foMaxAddr;
 		//private int FOmaxhistoryentries;
@@ -52,6 +52,13 @@ internal FOStation(Cumulus cumulus) : base(cumulus)
 
 			calculaterainrate = true;
 
+			cumulus.LogMessage("FO synchronise reads: " + cumulus.FineOffsetOptions.SyncReads);
+			if (cumulus.FineOffsetOptions.SyncReads)
+			{
+				cumulus.LogMessage("FO synchronise avoid time: " + cumulus.FineOffsetOptions.ReadAvoidPeriod);
+				cumulus.LogMessage($"FO last station time: {FOSensorClockTime:s}");
+			}
+
 			hasSolar = cumulus.StationType == StationTypes.FineOffsetSolar;
 
 			if (hasSolar)
@@ -613,8 +620,12 @@ private void ProcessHistoryData()
 		public override void Start()
 		{
 			tmrDataRead.Elapsed += DataReadTimerTick;
-			tmrDataRead.Interval = 10000;
+			tmrDataRead.Interval = 16000;
 			tmrDataRead.Enabled = true;
+
+			readingData = true;
+			GetAndProcessData();
+			readingData = false;
 		}
 
 		private bool OpenHidDevice()
@@ -837,34 +848,60 @@ private void GetAndProcessData()
 
 			if (cumulus.FineOffsetOptions.SyncReads && !synchronising)
 			{
+				var now = DateTime.Now;
+
 				if ((DateTime.Now - FOSensorClockTime).TotalDays > 1)
 				{
 					// (re)synchronise data reads to try to avoid USB lock-up problem
 
 					StartSynchronising();
-
-					return;
 				}
+				else
+				{
+					// Check that were not within N seconds of the station updating memory
+					bool sensorclockOK = ((int)(Math.Floor((now - FOSensorClockTime).TotalSeconds)) % 48 >= (cumulus.FineOffsetOptions.ReadAvoidPeriod - 1)) &&
+										 ((int)(Math.Floor((now - FOSensorClockTime).TotalSeconds)) % 48 <= (47 - cumulus.FineOffsetOptions.ReadAvoidPeriod));
 
-				// Check that were not within N seconds of the station updating memory
-				bool sensorclockOK = ((int)(Math.Floor((DateTime.Now - FOSensorClockTime).TotalSeconds))%48 >= (cumulus.FineOffsetOptions.ReadAvoidPeriod - 1)) &&
-				                     ((int)(Math.Floor((DateTime.Now - FOSensorClockTime).TotalSeconds))%48 <= (47 - cumulus.FineOffsetOptions.ReadAvoidPeriod));
-				bool stationclockOK = ((int)(Math.Floor((DateTime.Now - FOStationClockTime).TotalSeconds))%60 >= (cumulus.FineOffsetOptions.ReadAvoidPeriod - 1)) &&
-				                      ((int)(Math.Floor((DateTime.Now - FOStationClockTime).TotalSeconds))%60 <= (59 - cumulus.FineOffsetOptions.ReadAvoidPeriod));
+					//bool stationclockOK = ((int)(Math.Floor((now - FOStationClockTime).TotalSeconds)) % 60 >= (cumulus.FineOffsetOptions.ReadAvoidPeriod - 1)) &&
+					//					((int)(Math.Floor((now - FOStationClockTime).TotalSeconds)) % 60 <= (59 - cumulus.FineOffsetOptions.ReadAvoidPeriod));
 
-				if (!sensorclockOK || !stationclockOK)
-				{
-					if (!sensorclockOK)
+					bool solarclockOK = true;
+
+					if (hasSolar)
 					{
-						cumulus.LogDebugMessage("Within "+cumulus.FineOffsetOptions.ReadAvoidPeriod +" seconds of sensor data change, skipping read");
+						solarclockOK = ((int)(Math.Floor((now - FOSolarClockTime).TotalSeconds)) % 60 >= (cumulus.FineOffsetOptions.ReadAvoidPeriod - 1)) &&
+										((int)(Math.Floor((now - FOSolarClockTime).TotalSeconds)) % 60 <= (59 - cumulus.FineOffsetOptions.ReadAvoidPeriod));
 					}
 
-					if (!stationclockOK)
+					//if (!sensorclockOK || !stationclockOK || !solarclockOK)
+					if (!sensorclockOK || !solarclockOK)
 					{
-						cumulus.LogDebugMessage("Within " + cumulus.FineOffsetOptions.ReadAvoidPeriod + " seconds of station clock minute change, skipping read");
-					}
+						if (!sensorclockOK)
+						{
+							cumulus.LogDebugMessage("Synchronise: Within " + cumulus.FineOffsetOptions.ReadAvoidPeriod + " seconds of sensor data change, skipping read");
 
-					return;
+							cumulus.LogMessage("Pausing for 8 seconds to unsynchronise data reads with 48 second updates...");
+
+
+							// We'll shift the timer by 8 seconds to try and avoid it at completely
+							tmrDataRead.Enabled = false;
+							Thread.Sleep(8000);
+							tmrDataRead.Enabled = true;
+						}
+
+						if (!solarclockOK)
+						{
+							cumulus.LogDebugMessage("Synchronise: Within " + cumulus.FineOffsetOptions.ReadAvoidPeriod + " seconds of solar change, skipping read");
+						}
+
+
+						/*
+						if (!stationclockOK)
+						{
+							cumulus.LogDebugMessage("Synchronise: Within " + cumulus.FineOffsetOptions.ReadAvoidPeriod + " seconds of console clock minute change, skipping read");
+						}
+						*/
+					}
 				}
 			}
 
@@ -880,20 +917,20 @@ private void GetAndProcessData()
 
 			cumulus.LogDataMessage("First block read, addr = " + addr.ToString("X4"));
 
-			if (addr != prevaddr)
+			if (prevaddr == -1)
+			{
+				prevaddr = addr;
+			}
+			else if (addr != prevaddr)
 			{
 				// location has changed, skip this read to give it chance to update
 				//cumulus.LogMessage("Location changed, skipping");
-				cumulus.LogDebugMessage("Address changed");
+				cumulus.LogDebugMessage("Address changed, avoid reading data this time");
 				cumulus.LogDebugMessage("addr=" + addr.ToString("X4") + " previous=" + prevaddr.ToString("X4"));
 
-				if (synchroPhase == 2)
-				{
-					FOStationClockTime = DateTime.Now;
-					StopSynchronising();
-				}
-
 				prevaddr = addr;
+				hadfirstsyncdata = false;
+
 				return;
 			}
 			else
@@ -911,15 +948,76 @@ private void GetAndProcessData()
 
 				if (synchronising)
 				{
-					if (synchroPhase == 1)
+					bool datachanged = false;
+					// ReadCounter determines whether we actually process the data (every 10 seconds)
+					readCounter++;
+					if (hadfirstsyncdata)
 					{
-						// phase 1 - sensor clock
-						bool datachanged = false;
-						// ReadCounter determines whether we actually process the data (every 10 seconds)
-						readCounter++;
+
+						// Sensor Data change detection
+
+						// ignore the first byte as this is a time increment every minute
+						for (int i = 1; i < 16; i++)
+						{
+							if (prevdata[i] != data[i])
+							{
+								datachanged = true;
+							}
+						}
+
+						if (datachanged)
+						{
+							cumulus.LogConsoleMessage("Sensor data changed");
+							cumulus.LogMessage("Synchronise: Sensor data changed");
+
+							if (FOSensorClockTime == DateTime.MinValue)
+							{
+								FOSensorClockTime = now;
+							}
+
+							for (int i = 1; i < 16; i++)
+							{
+								prevdata[i] = data[i];
+							}
+						}
+
+						// station clock minute change
+						// the minutes in the data block only seems to update when data is written to the block,
+						// so we cannot use that as an accurate indication of when the console clock minute changes
+						/*
+						if (prevdata[0] != data[0])
+						{
+							cumulus.LogConsoleMessage("Console clock minute changed");
+							cumulus.LogMessage("Synchronise: Console clock minute changed");
+
+							FOStationClockTime = now;
+
+							if (FOStationClockTime == DateTime.MinValue)
+							{
+								FOStationClockTime = now;
+							}
+
+							prevdata[0] = data[0];
+						}
+						*/
+					}
+					else
+					{
+						hadfirstsyncdata = true;
+						for (int i = 0; i < 16; i++)
+						{
+							prevdata[i] = data[i];
+						}
+
+					}
+
+					// now do the solar
+					if (hasSolar)
+					{
+						datachanged = false;
 						if (hadfirstsyncdata)
 						{
-							for (int i = 0; i < 16; i++)
+							for (int i = 16; i < 20; i++)
 							{
 								if (prevdata[i] != data[i])
 								{
@@ -929,28 +1027,46 @@ private void GetAndProcessData()
 
 							if (datachanged)
 							{
-								FOSensorClockTime = DateTime.Now;
-								synchroPhase = 2;
+								cumulus.LogConsoleMessage("Solar data changed");
+								cumulus.LogMessage("Synchronise: Solar data changed");
+
+								if (FOSolarClockTime == DateTime.MinValue)
+								{
+									FOSolarClockTime = now;
+								}
+
+								for (int i = 16; i < 20; i++)
+								{
+									prevdata[i] = data[i];
+								}
 							}
 						}
 					}
-					else
+
+					//if (FOSensorClockTime != DateTime.MinValue && FOStationClockTime != DateTime.MinValue)
+					if (FOSensorClockTime != DateTime.MinValue)
 					{
-						// Phase 2 - station clock
-						readCounter++;
+						if (hasSolar)
+						{
+							if (FOSolarClockTime != DateTime.MinValue)
+							{
+								StopSynchronising();
+							}
+						}
+						else
+						{
+							StopSynchronising();
+						}
 					}
-				}
 
-				hadfirstsyncdata = true;
-				for (int i = 0; i < 16; i++)
-				{
-					prevdata[i] = data[i];
+					readCounter++;
 				}
 
-				if (!synchronising || (readCounter%20) == 0)
+
+				if (!synchronising || (readCounter % 20) == 0)
 				{
-					LatestFOReading = addr.ToString("X4") + ": " + BitConverter.ToString(data, 0, 16);
-					cumulus.LogDataMessage(LatestFOReading);
+					LatestFOReading = addr.ToString("X4") + " Data: " + BitConverter.ToString(data, 0, 16);
+					cumulus.LogDataMessage("Latest Block: " + LatestFOReading);
 
 					// Indoor Humidity ====================================================
 					int inhum = data[1];
@@ -1120,7 +1236,7 @@ private void GetAndProcessData()
 
 							if (ignoreraincount == 6)
 							{
-								cumulus.LogMessage("Six consecutive readings; accepting value. Adjusting start of day figure to compensate");
+								cumulus.LogMessage("Six consecutive rain readings; accepting value. Adjusting start of day figure to compensate");
 								raindaystart += (raindiff*0.3);
 								// adjust current rain total counter
 								Raincounter += (raindiff*0.3);
@@ -1180,12 +1296,14 @@ private void GetAndProcessData()
 		private void StartSynchronising()
 		{
 			previousSensorClock = FOSensorClockTime;
-			previousStationClock = FOStationClockTime;
+			//previousStationClock = FOStationClockTime;
+			previousSolarClock = FOSolarClockTime;
 			synchronising = true;
-			synchroPhase = 1;
 			hadfirstsyncdata = false;
 			readCounter = 0;
-			cumulus.LogMessage("Start Synchronising");
+			cumulus.LogMessage("Start Synchronising with console");
+			cumulus.LogConsoleMessage("Start Synchronising with console");
+
 
 			tmrDataRead.Interval = 500; // half a second
 		}
@@ -1195,14 +1313,13 @@ private void StopSynchronising()
 			int secsdiff;
 
 			synchronising = false;
-			synchroPhase = 0;
 			if (previousSensorClock == DateTime.MinValue)
 			{
 				cumulus.LogMessage("Sensor clock  " + FOSensorClockTime.ToLongTimeString());
 			}
 			else
 			{
-				secsdiff = (int) Math.Floor((FOSensorClockTime - previousSensorClock).TotalSeconds)%48;
+				secsdiff = (int) Math.Floor((FOSensorClockTime - previousSensorClock).TotalSeconds) % 48;
 				if (secsdiff > 24)
 				{
 					secsdiff = 48 - secsdiff;
@@ -1210,28 +1327,43 @@ private void StopSynchronising()
 				cumulus.LogMessage("Sensor clock  " + FOSensorClockTime.ToLongTimeString() + " drift = " + secsdiff + " seconds");
 			}
 
+			/*
 			if (previousStationClock == DateTime.MinValue)
 			{
 				cumulus.LogMessage("Station clock " + FOStationClockTime.ToLongTimeString());
 			}
-
 			else
 			{
-				secsdiff = (int) Math.Floor((FOStationClockTime - previousStationClock).TotalSeconds)%60;
+				secsdiff = (int)Math.Floor((FOStationClockTime - previousStationClock).TotalSeconds) % 60;
 				if (secsdiff > 30)
 				{
 					secsdiff = 60 - secsdiff;
 				}
 				cumulus.LogMessage("Station clock  " + FOStationClockTime.ToLongTimeString() + " drift = " + secsdiff + " seconds");
 			}
-			tmrDataRead.Interval = 10000; // 10 seconds
-			tmrDataRead.Enabled = false;
-			// sleep 5 secs to get out of sync with station clock minute change
-			Thread.Sleep(5000);
+			*/
 
-			tmrDataRead.Enabled = true;
+			if (hasSolar)
+			{
+				if (previousSolarClock == DateTime.MinValue)
+				{
+					cumulus.LogMessage("Solar clock " + FOSolarClockTime.ToLongTimeString());
+				}
+				else
+				{
+					secsdiff = (int)Math.Floor((FOSolarClockTime - previousSolarClock).TotalSeconds) % 60;
+					if (secsdiff > 30)
+					{
+						secsdiff = 60 - secsdiff;
+					}
+					cumulus.LogMessage("Solar clock  " + FOSolarClockTime.ToLongTimeString() + " drift = " + secsdiff + " seconds");
+				}
+			}
+
+			tmrDataRead.Interval = 16000; // 16 seconds
 
 			cumulus.LogMessage("Stop Synchronising");
+			cumulus.LogConsoleMessage("Stop Synchronising");
 		}
 
 		//public double EWpressureoffset { get; set; }
diff --git a/CumulusMX/GW1000Station.cs b/CumulusMX/GW1000Station.cs
index a28c2c8d..f5d2b556 100644
--- a/CumulusMX/GW1000Station.cs
+++ b/CumulusMX/GW1000Station.cs
@@ -40,8 +40,8 @@ internal class GW1000Station : WeatherStation
 
 		//private readonly NumberFormatInfo invNum = CultureInfo.InvariantCulture.NumberFormat;
 
-		private readonly Version fwVersion;
-		private readonly string gatewayType;
+		private Version fwVersion;
+		private string gatewayType;
 
 
 		public GW1000Station(Cumulus cumulus) : base(cumulus)
@@ -56,6 +56,8 @@ public GW1000Station(Cumulus cumulus) : base(cumulus)
 			// GW1000 does not provide an interval gust value, it gives us a 30 second high
 			// so force using the wind speed for the average calculation
 			cumulus.StationOptions.UseSpeedForAvgCalc = true;
+			// also use it for the Latest value
+			cumulus.StationOptions.UseSpeedForLatest = true;
 
 			LightningTime = DateTime.MinValue;
 			LightningDistance = -1.0;
@@ -102,45 +104,7 @@ public GW1000Station(Cumulus cumulus) : base(cumulus)
 
 			if (DoDiscovery())
 			{
-				cumulus.LogMessage("Using IP address = " + ipaddr + " Port = " + AtPort);
-
-				connectedOk = Api.OpenTcpPort(ipaddr, AtPort);
-
-				if (connectedOk)
-				{
-					cumulus.LogMessage("Connected OK");
-					cumulus.LogConsoleMessage("Connected to station");
-				}
-				else
-				{
-					cumulus.LogMessage("Not Connected");
-					cumulus.LogConsoleMessage("Unable to connect to station", ConsoleColor.Red);
-				}
-
-				if (connectedOk)
-				{
-					// Get the firmware version as check we are communicating
-					GW1000FirmwareVersion = GetFirmwareVersion();
-					cumulus.LogMessage($"Ecowitt firmware version: {GW1000FirmwareVersion}");
-					if (GW1000FirmwareVersion != "???")
-					{
-						var fwString = GW1000FirmwareVersion.Split(new string[] { "_V" }, StringSplitOptions.None);
-						if (fwString.Length > 1)
-						{
-							gatewayType = fwString[0];
-							fwVersion = new Version(fwString[1]);
-						}
-						else
-						{
-							// failed to get the version, lets assume it's fairly new
-							fwVersion = new Version("1.6.5");
-						}
-					}
-
-					GetSystemInfo();
-
-					GetSensorIdsNew();
-				}
+				PostDiscovery();         
 			}
 
 			LoadLastHoursFromDataLogs(cumulus.LastUpdateTime);
@@ -215,9 +179,18 @@ public override void Start()
 								cumulus.LogMessage("Reconnected to Ecowitt device");
 								GetLiveData();
 							}
+							else
+							{
+								// add a small extra delay before trying again
+								cumulus.LogMessage("Delaying before attempting reconnect");
+								if (cancellationToken.WaitHandle.WaitOne(TimeSpan.FromMilliseconds(20000)))
+								{
+									break;
+								}
+							}
 						}
 
-						delay = updateRate - (dataLastRead - DateTime.Now).TotalMilliseconds;
+						delay = Math.Min(updateRate - (dataLastRead - DateTime.Now).TotalMilliseconds, updateRate);
 
 						if (cancellationToken.WaitHandle.WaitOne(TimeSpan.FromMilliseconds(delay)))
 						{
@@ -334,16 +307,16 @@ private Discovery DiscoverGW1000()
 
 					// bind the cient to the primary address - broadcast does not work with .Any address :(
 					client.Client.Bind(new IPEndPoint(myIP, broadcastPort));
-					// time out listening after 1 second
-					client.Client.ReceiveTimeout = 1000;
+					// time out listening after 1.5 second
+					client.Client.ReceiveTimeout = 1500;
 
 					// we are going to attempt discovery twice
 					var retryCount = 1;
 					do
 					{
 						cumulus.LogDebugMessage("Discovery Run #" + retryCount);
-						// each time we wait 1 second for any responses
-						var endTime = DateTime.Now.AddSeconds(1);
+						// each time we wait 1.5 second for any responses
+						var endTime = DateTime.Now.AddSeconds(1.5);
 
 						try
 						{
@@ -503,6 +476,49 @@ private bool DoDiscovery()
 			return true;
 		}
 
+		private void PostDiscovery()
+		{
+			cumulus.LogMessage("Using IP address = " + ipaddr + " Port = " + AtPort);
+
+			connectedOk = Api.OpenTcpPort(ipaddr, AtPort);
+
+			if (connectedOk)
+			{
+				cumulus.LogMessage("Connected OK");
+				cumulus.LogConsoleMessage("Connected to station");
+			}
+			else
+			{
+				cumulus.LogMessage("Not Connected");
+				cumulus.LogConsoleMessage("Unable to connect to station", ConsoleColor.Red);
+			}
+
+			if (connectedOk)
+			{
+				// Get the firmware version as check we are communicating
+				GW1000FirmwareVersion = GetFirmwareVersion();
+				cumulus.LogMessage($"Ecowitt firmware version: {GW1000FirmwareVersion}");
+				if (GW1000FirmwareVersion != "???")
+				{
+					var fwString = GW1000FirmwareVersion.Split(new string[] { "_V" }, StringSplitOptions.None);
+					if (fwString.Length > 1)
+					{
+						gatewayType = fwString[0];
+						fwVersion = new Version(fwString[1]);
+					}
+					else
+					{
+						// failed to get the version, lets assume it's fairly new
+						fwVersion = new Version("1.6.5");
+					}
+				}
+
+				GetSystemInfo();
+
+				GetSensorIdsNew();
+			}
+		}
+
 		private string GetFirmwareVersion()
 		{
 			var response = "???";
@@ -1619,7 +1635,10 @@ private void DataTimeout(object source, ElapsedEventArgs e)
 				DataStopped = true;
 				cumulus.DataStoppedAlarm.LastError = $"No data received from the GW1000 for {tmrDataWatchdog.Interval / 1000} seconds";
 				cumulus.DataStoppedAlarm.Triggered = true;
-				DoDiscovery();
+				if (DoDiscovery())
+				{
+					PostDiscovery();
+				}
 			}
 		}
 	}
diff --git a/CumulusMX/HttpStationEcowitt.cs b/CumulusMX/HttpStationEcowitt.cs
index 996ca937..79db362e 100644
--- a/CumulusMX/HttpStationEcowitt.cs
+++ b/CumulusMX/HttpStationEcowitt.cs
@@ -51,6 +51,8 @@ public HttpStationEcowitt(Cumulus cumulus, WeatherStation station = null) : base
 				// The speed is the average for that update
 				// Therefore we need to force using the speed for the average calculation
 				cumulus.StationOptions.UseSpeedForAvgCalc = true;
+				// also use it for the Latest value
+				cumulus.StationOptions.UseSpeedForLatest = true;
 
 				// does not send DP, so force MX to calculate it
 				cumulus.StationOptions.CalculatedDP = true;
diff --git a/CumulusMX/IniFile.cs b/CumulusMX/IniFile.cs
index 2877ade6..b04048c7 100644
--- a/CumulusMX/IniFile.cs
+++ b/CumulusMX/IniFile.cs
@@ -321,7 +321,7 @@ private string EncodeByteArray(byte[] Value)
 				}
 				else
 				{
-					if (l < 2) sb.Append("0");
+					if (l < 2) sb.Append('0');
 					sb.Append(hex);
 				}
 			}
diff --git a/CumulusMX/InternetSettings.cs b/CumulusMX/InternetSettings.cs
index 05359e00..ea4293f6 100644
--- a/CumulusMX/InternetSettings.cs
+++ b/CumulusMX/InternetSettings.cs
@@ -559,13 +559,13 @@ public string GetExtraWebFilesData()
 				string utf8 = cumulus.ExtraFiles[i].UTF8 ? "true" : "false";
 				string binary = cumulus.ExtraFiles[i].binary ? "true" : "false";
 				string endofday = cumulus.ExtraFiles[i].endofday ? "true" : "false";
-				json.Append("{");
+				json.Append('{');
 				json.Append($"\"id\":{(i + 1)},\"values\":[\"{local}\",\"{remote}\",\"{process}\",\"{realtime}\",\"{ftp}\",\"{utf8}\",\"{binary}\",\"{endofday}\"]");
-				json.Append("}");
+				json.Append('}');
 
 				if (i < Cumulus.numextrafiles - 1)
 				{
-					json.Append(",");
+					json.Append(',');
 				}
 			}
 
diff --git a/CumulusMX/MXWebSocket.cs b/CumulusMX/MXWebSocket.cs
index eec5adee..210762be 100644
--- a/CumulusMX/MXWebSocket.cs
+++ b/CumulusMX/MXWebSocket.cs
@@ -6,6 +6,7 @@ namespace CumulusMX
 	public class MxWebSocket : WebSocketModule
 	{
 		private readonly Cumulus cumulus;
+		private WeatherStation station;
 
 		public MxWebSocket(string urlPath, Cumulus cumulus) : base(urlPath, true)
 		{
@@ -15,14 +16,19 @@ public MxWebSocket(string urlPath, Cumulus cumulus) : base(urlPath, true)
 		/// <inheritdoc />
 		protected override async Task OnClientConnectedAsync(IWebSocketContext context)
 		{
-			cumulus.LogDebugMessage("WS Client Connect: " + context.RemoteEndPoint.Address.ToString());
+			cumulus.LogDebugMessage("WS Client Connect: " + context.RemoteEndPoint.Address.ToString() + ", Total clients: " + ConnectedClients);
+			if (station != null)
+			{
+				// send an update right away so the client is not left waiting
+				await station.sendWebSocketData(true);
+			}
 			await Task.CompletedTask;
 		}
 
 		/// <inheritdoc />
 		protected override async Task OnClientDisconnectedAsync(IWebSocketContext context)
 		{
-			cumulus.LogDebugMessage("WS Client Disconnected: " + context.RemoteEndPoint.Address.ToString());
+			cumulus.LogDebugMessage("WS Client Disconnected: " + context.RemoteEndPoint.Address.ToString() + ", Total clients: " + ConnectedClients);
 			await Task.CompletedTask;
 		}
 
@@ -37,8 +43,14 @@ public void SendMessage(string message)
 			BroadcastAsync(message).Wait();
 		}
 
-		public int ConnectedClients {
+		public int ConnectedClients
+		{
 			get { return this.ActiveContexts.Count; }
 		}
+
+		internal WeatherStation SetStation
+		{
+			set { station = value; }
+		}
 	}
 }
diff --git a/CumulusMX/MqttPublisher.cs b/CumulusMX/MqttPublisher.cs
index 1201b7f8..8dcd8206 100644
--- a/CumulusMX/MqttPublisher.cs
+++ b/CumulusMX/MqttPublisher.cs
@@ -25,11 +25,11 @@ public static void Setup(Cumulus cumulus)
 
 			var clientId = Guid.NewGuid().ToString();
 
-			var mqttTcpOptions = new MQTTnet.Client.Options.MqttClientTcpOptions
+			var mqttTcpOptions = new MQTTnet.Client.MqttClientTcpOptions
 			{
 				Server = cumulus.MQTT.Server,
 				Port = cumulus.MQTT.Port,
-				TlsOptions = new MQTTnet.Client.Options.MqttClientTlsOptions { UseTls = cumulus.MQTT.UseTLS }
+				TlsOptions = new MQTTnet.Client.MqttClientTlsOptions { UseTls = cumulus.MQTT.UseTLS }
 			};
 
 			switch (cumulus.MQTT.IpVersion)
@@ -45,23 +45,19 @@ public static void Setup(Cumulus cumulus)
 					break;
 			}
 
-			var mqttOptions = new MQTTnet.Client.Options.MqttClientOptions
+			var mqttOptions = new MQTTnet.Client.MqttClientOptions
 			{
 				ChannelOptions = mqttTcpOptions,
 				ClientId = clientId,
 				Credentials = string.IsNullOrEmpty(cumulus.MQTT.Password)
 					? null
-					: new MQTTnet.Client.Options.MqttClientCredentials
-					{
-						Username = cumulus.MQTT.Username,
-						Password = System.Text.Encoding.UTF8.GetBytes(cumulus.MQTT.Password)
-					},
+					: new MQTTnet.Client.MqttClientCredentials(cumulus.MQTT.Username, System.Text.Encoding.UTF8.GetBytes(cumulus.MQTT.Password)),
 				CleanSession = true
 			};
 
 			Connect(mqttOptions);
 
-			mqttClient.UseDisconnectedHandler(async e =>
+			mqttClient.DisconnectedAsync += (async e =>
 			{
 				cumulus.LogMessage("Error: MQTT disconnected from the server");
 				await Task.Delay(TimeSpan.FromSeconds(5));
@@ -101,7 +97,7 @@ private static async Task SendMessageAsync(string topic, string message, bool re
 			}
 		}
 
-		private static async void Connect(MQTTnet.Client.Options.IMqttClientOptions options)
+		private static async void Connect(MQTTnet.Client.MqttClientOptions options)
 		{
 			try
 			{
diff --git a/CumulusMX/NOAAReports.cs b/CumulusMX/NOAAReports.cs
index bffb4ea5..8582401d 100644
--- a/CumulusMX/NOAAReports.cs
+++ b/CumulusMX/NOAAReports.cs
@@ -79,7 +79,8 @@ public List<string> GetNoaaYearReport(int year)
 			{
 				reportName = noaats.ToString(cumulus.NOAAconf.YearFile);
 				noaafile = cumulus.ReportPath + reportName;
-				report = File.Exists(noaafile) ? new List<string>(File.ReadAllLines(noaafile)) : new List<String> { "That report does not exist" };
+				var encoding = cumulus.NOAAconf.UseUtf8 ? Encoding.GetEncoding("utf-8") : Encoding.GetEncoding("iso-8859-1");
+				report = File.Exists(noaafile) ? new List<string>(File.ReadAllLines(noaafile, encoding)) : new List<String> { "That report does not exist" };
 			}
 			catch (Exception e)
 			{
@@ -99,6 +100,7 @@ public List<string> GetNoaaMonthReport(int year, int month)
 				noaafile = cumulus.ReportPath + reportName;
 				var encoding = cumulus.NOAAconf.UseUtf8 ? Encoding.GetEncoding("utf-8") : Encoding.GetEncoding("iso-8859-1");
 				report = File.Exists(noaafile) ? new List<string> (File.ReadAllLines(noaafile, encoding)) : new List<string> { "That report does not exist" };
+				//cumulus.LogDebugMessage("NOAA Report\n" + string.Join("\n",report.ToArray()));
 			}
 			catch (Exception e)
 			{
diff --git a/CumulusMX/Properties/AssemblyInfo.cs b/CumulusMX/Properties/AssemblyInfo.cs
index 99f2d81c..a1f6a69e 100644
--- a/CumulusMX/Properties/AssemblyInfo.cs
+++ b/CumulusMX/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Cumulus MX")]
-[assembly: AssemblyDescription("Version 3.18.0 - Build 3190")]
+[assembly: AssemblyDescription("Version 3.19.0 - Build 3191")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Cumulus MX")]
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.18.0.3190")]
-[assembly: AssemblyFileVersion("3.18.0.3190")]
+[assembly: AssemblyVersion("3.19.0.3191")]
+[assembly: AssemblyFileVersion("3.19.0.3191")]
diff --git a/CumulusMX/SQLite.cs b/CumulusMX/SQLite.cs
index 502d069c..76e460a5 100644
--- a/CumulusMX/SQLite.cs
+++ b/CumulusMX/SQLite.cs
@@ -2803,15 +2803,15 @@ private CompileResult CompileExpr (Expression expr, List<object> queryArgs)
 					//
 					if (val != null && val is System.Collections.IEnumerable && !(val is string) && !(val is System.Collections.Generic.IEnumerable<byte>)) {
 						var sb = new System.Text.StringBuilder();
-						sb.Append("(");
+						sb.Append('(');
 						var head = "";
 						foreach (var a in (System.Collections.IEnumerable)val) {
 							queryArgs.Add(a);
 							sb.Append(head);
-							sb.Append("?");
+							sb.Append('?');
 							head = ",";
 						}
-						sb.Append(")");
+						sb.Append(')');
 						return new CompileResult {
 							CommandText = sb.ToString(),
 							Value = val
diff --git a/CumulusMX/StationSettings.cs b/CumulusMX/StationSettings.cs
index 25c23d60..32f43324 100644
--- a/CumulusMX/StationSettings.cs
+++ b/CumulusMX/StationSettings.cs
@@ -1675,7 +1675,7 @@ internal class JsonStationSettingsEcowittApi
 		public string mac { get; set; }
 	}
 
-	internal class JsonStationSettingsEcowittMappings
+	public class JsonStationSettingsEcowittMappings
 	{
 		public int primaryTHsensor { get; set; }
 		public int primaryRainSensor { get; set; }
diff --git a/CumulusMX/ThirdPartySettings.cs b/CumulusMX/ThirdPartySettings.cs
index 35cd8cbe..63048713 100644
--- a/CumulusMX/ThirdPartySettings.cs
+++ b/CumulusMX/ThirdPartySettings.cs
@@ -47,26 +47,6 @@ public string UpdateConfig(IHttpContext context)
 			{
 				cumulus.LogMessage("Updating third party settings");
 
-				// twitter
-				try
-				{
-					cumulus.Twitter.Enabled = settings.twitter.enabled;
-					if (cumulus.Twitter.Enabled)
-					{
-						cumulus.Twitter.Interval = settings.twitter.interval;
-						cumulus.Twitter.PW = settings.twitter.password ?? string.Empty;
-						cumulus.Twitter.SendLocation = settings.twitter.sendlocation;
-						cumulus.Twitter.ID = settings.twitter.user ?? string.Empty;
-					}
-				}
-				catch (Exception ex)
-				{
-					var msg = "Error processing twitter settings: " + ex.Message;
-					cumulus.LogMessage(msg);
-					errorMsg += msg + "\n\n";
-					context.Response.StatusCode = 500;
-				}
-
 				// wunderground
 				try
 				{
@@ -346,15 +326,6 @@ public string UpdateConfig(IHttpContext context)
 
 		public string GetAlpacaFormData()
 		{
-			var twittersettings = new JsonThirdPartySettingsTwitterSettings()
-			{
-				enabled = cumulus.Twitter.Enabled,
-				interval = cumulus.Twitter.Interval,
-				password = cumulus.Twitter.PW,
-				sendlocation = cumulus.Twitter.SendLocation,
-				user = cumulus.Twitter.ID
-			};
-
 			var wusettings = new JsonThirdPartySettingsWunderground()
 			{
 				catchup = cumulus.Wund.CatchUp,
@@ -489,7 +460,6 @@ public string GetAlpacaFormData()
 			var data = new JsonThirdPartySettings()
 			{
 				accessible = cumulus.ProgramOptions.EnableAccessibility,
-				twitter = twittersettings,
 				wunderground = wusettings,
 				windy = windysettings,
 				awekas = awekassettings,
@@ -510,7 +480,6 @@ public string GetAlpacaFormData()
 	public class JsonThirdPartySettings
 	{
 		public bool accessible { get; set; }
-		public JsonThirdPartySettingsTwitterSettings twitter { get; set; }
 		public JsonThirdPartySettingsWunderground wunderground { get; set; }
 		public JsonThirdPartySettingsWindy windy { get; set; }
 		public JsonThirdPartySettingsPWSweather pwsweather { get; set; }
@@ -523,15 +492,6 @@ public class JsonThirdPartySettings
 		public JsonThirdPartySettingsCustomHttpSettings customhttp { get; set; }
 	}
 
-	public class JsonThirdPartySettingsTwitterSettings
-	{
-		public bool enabled { get; set; }
-		public bool sendlocation { get; set; }
-		public int interval { get; set; }
-		public string user { get; set; }
-		public string password { get; set; }
-	}
-
 	public class JsonThirdPartySettingsWunderground
 	{
 		public bool enabled { get; set; }
diff --git a/CumulusMX/WMR200Station.cs b/CumulusMX/WMR200Station.cs
index 64754aae..95c3321d 100644
--- a/CumulusMX/WMR200Station.cs
+++ b/CumulusMX/WMR200Station.cs
@@ -1625,7 +1625,7 @@ private void ProcessWMR200Packet()
 			for (int i = 0; i < packetBuffer[1]; i++)
 			{
 				str.Append(packetBuffer[i].ToString("X2"));
-				str.Append(" ");
+				str.Append(' ');
 			}
 
 			cumulus.LogDataMessage($"Packet:{str}");
diff --git a/CumulusMX/WS2300Station.cs b/CumulusMX/WS2300Station.cs
index 905f31d1..f783a790 100644
--- a/CumulusMX/WS2300Station.cs
+++ b/CumulusMX/WS2300Station.cs
@@ -547,7 +547,7 @@ private int Ws2300ReadHistoryRecord(int record, out int address, out double temp
 			for (int n = 0; n < bytes; n++)
 			{
 				msg.Append(data[n].ToString("X2"));
-				msg.Append(" ");
+				msg.Append(' ');
 			}
 
 			cumulus.LogMessage(msg.ToString());
diff --git a/CumulusMX/WeatherStation.cs b/CumulusMX/WeatherStation.cs
index 2ff245b1..cf510eb4 100644
--- a/CumulusMX/WeatherStation.cs
+++ b/CumulusMX/WeatherStation.cs
@@ -595,6 +595,7 @@ public void ReadTodayFile()
 
 			FOSensorClockTime = ini.GetValue("FineOffset", "FOSensorClockTime", DateTime.MinValue);
 			FOStationClockTime = ini.GetValue("FineOffset", "FOStationClockTime", DateTime.MinValue);
+			FOSolarClockTime = ini.GetValue("FineOffset", "FOSolarClockTime", DateTime.MinValue);
 			if (cumulus.FineOffsetOptions.SyncReads)
 			{
 				cumulus.LogMessage("Sensor clock  " + FOSensorClockTime.ToLongTimeString());
@@ -829,6 +830,7 @@ public void WriteTodayFile(DateTime timestamp, bool Log)
 				// Special Fine Offset data
 				ini.SetValue("FineOffset", "FOSensorClockTime", FOSensorClockTime);
 				ini.SetValue("FineOffset", "FOStationClockTime", FOStationClockTime);
+				ini.SetValue("FineOffset", "FOSolarClockTime", FOSolarClockTime);
 
 				// Records
 				ini.SetValue("Records", "Alltime", AlltimeRecordTimestamp);
@@ -1459,11 +1461,15 @@ public void SecondTimer(object sender, ElapsedEventArgs e)
 			}
 		}
 
-		private async Task sendWebSocketData()
+		internal async Task sendWebSocketData(bool wait = false)
 		{
 			// Don't do anything if there are no clients connected
 			if (cumulus.WebSock.ConnectedClients == 0)
 			{
+				if (webSocketSemaphore.CurrentCount == 0)
+				{
+					webSocketSemaphore.Release();
+				}
 				return;
 			}
 
@@ -1475,15 +1481,13 @@ private async Task sendWebSocketData()
 			try
 			{
 				// if we already have an update queued, don't add to the wait queue. Otherwise we get hundreds queued up during catch-up
-				if (webSocketSemaphore.CurrentCount == 0)
+				// Zero wait time for the ws lock object unless wait = true
+				if (!webSocketSemaphore.Wait(wait ? 0 : 600))
 				{
 					cumulus.LogDebugMessage("sendWebSocketData: Update already running, skipping this one");
 					return;
 				}
 
-				// wait for the ws lock object
-				webSocketSemaphore.Wait();
-
 				StringBuilder windRoseData = new StringBuilder(80);
 
 				lock (windcounts)
@@ -1492,7 +1496,7 @@ private async Task sendWebSocketData()
 
 					for (var i = 1; i < cumulus.NumWindRosePoints; i++)
 					{
-						windRoseData.Append(",");
+						windRoseData.Append(',');
 						windRoseData.Append((windcounts[i] * cumulus.Calib.WindGust.Mult).ToString(cumulus.WindFormat, CultureInfo.InvariantCulture));
 					}
 				}
@@ -1540,10 +1544,8 @@ private async Task sendWebSocketData()
 			{
 				cumulus.LogMessage("sendWebSocketData: Error - " + ex.Message);
 			}
-			finally
-			{
-				webSocketSemaphore.Release();
-			}
+
+			webSocketSemaphore.Release();
 		}
 
 		private string getTimeString(DateTime time)
@@ -1824,11 +1826,6 @@ private void MinuteChanged(DateTime now)
 						UpdateAPRS();
 					}
 
-					if (cumulus.Twitter.Enabled && (now.Minute % cumulus.Twitter.Interval == 0) && !String.IsNullOrWhiteSpace(cumulus.Twitter.ID) && !String.IsNullOrWhiteSpace(cumulus.Twitter.PW))
-					{
-						cumulus.UpdateTwitter();
-					}
-
 					if (cumulus.xapEnabled)
 					{
 						using (Socket sock = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp))
@@ -1864,7 +1861,7 @@ private void MinuteChanged(DateTime now)
 							xapReport.Append($"DewF={ConvertUserTempToF(OutdoorDewpoint):F1}\n");
 							xapReport.Append($"AirPressure={ConvertUserPressToMB(Pressure):F1}\n");
 							xapReport.Append($"Rain={ConvertUserRainToMM(RainToday):F1}\n");
-							xapReport.Append("}");
+							xapReport.Append('}');
 
 							data = Encoding.ASCII.GetBytes(xapReport.ToString());
 
@@ -2276,7 +2273,7 @@ public string GetSolarGraphData()
 				if (sbUv[sbUv.Length - 1] == ',')
 					sbUv.Length--;
 
-				sbUv.Append("]");
+				sbUv.Append(']');
 				sb.Append(sbUv);
 			}
 			if (cumulus.GraphOptions.SolarVisible)
@@ -2287,18 +2284,18 @@ public string GetSolarGraphData()
 					sbMax.Length--;
 				}
 
-				sbSol.Append("]");
-				sbMax.Append("]");
+				sbSol.Append(']');
+				sbMax.Append(']');
 				if (cumulus.GraphOptions.UVVisible)
 				{
-					sb.Append(",");
+					sb.Append(',');
 				}
 				sb.Append(sbSol);
-				sb.Append(",");
+				sb.Append(',');
 				sb.Append(sbMax);
 			}
 
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -2327,10 +2324,10 @@ public string GetRainGraphData()
 				sbRate.Length--;
 			}
 			sbRain.Append("],");
-			sbRate.Append("]");
+			sbRate.Append(']');
 			sb.Append(sbRain);
 			sb.Append(sbRate);
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -2361,7 +2358,7 @@ public string GetHumGraphData()
 				if (sbOut[sbOut.Length - 1] == ',')
 					sbOut.Length--;
 
-				sbOut.Append("]");
+				sbOut.Append(']');
 
 				sb.Append(sbOut);
 			}
@@ -2371,15 +2368,15 @@ public string GetHumGraphData()
 				if (sbIn[sbIn.Length - 1] == ',')
 					sbIn.Length--;
 
-				sbIn.Append("]");
+				sbIn.Append(']');
 
 				if (cumulus.GraphOptions.OutHumVisible)
-					sb.Append(",");
+					sb.Append(',');
 
 				sb.Append(sbIn);
 			}
 
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -2402,12 +2399,12 @@ public string GetWindDirGraphData()
 			{
 				sb.Length--;
 				sbAvg.Length--;
-				sbAvg.Append("]");
+				sbAvg.Append(']');
 			}
 
 			sb.Append("],");
 			sb.Append(sbAvg);
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -2431,12 +2428,12 @@ public string GetWindGraphData()
 			{
 				sb.Length--;
 				sbSpd.Length--;
-				sbSpd.Append("]");
+				sbSpd.Append(']');
 			}
 
 			sb.Append("],");
 			sb.Append(sbSpd);
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -2509,7 +2506,7 @@ public string GetTempGraphData()
 				if (sbIn[sbIn.Length - 1] == ',')
 					sbIn.Length--;
 
-				sbIn.Append("]");
+				sbIn.Append(']');
 				sb.Append(sbIn);
 				append = true;
 			}
@@ -2519,7 +2516,7 @@ public string GetTempGraphData()
 				if (sbDew[sbDew.Length - 1] == ',')
 					sbDew.Length--;
 
-				sbDew.Append("]");
+				sbDew.Append(']');
 				sb.Append((append ? "," : "") + sbDew);
 				append = true;
 			}
@@ -2529,7 +2526,7 @@ public string GetTempGraphData()
 				if (sbApp[sbApp.Length - 1] == ',')
 					sbApp.Length--;
 
-				sbApp.Append("]");
+				sbApp.Append(']');
 				sb.Append((append ? "," : "") + sbApp);
 				append = true;
 			}
@@ -2539,7 +2536,7 @@ public string GetTempGraphData()
 				if (sbFeel[sbFeel.Length - 1] == ',')
 					sbFeel.Length--;
 
-				sbFeel.Append("]");
+				sbFeel.Append(']');
 				sb.Append((append ? "," : "") + sbFeel);
 				append = true;
 			}
@@ -2549,7 +2546,7 @@ public string GetTempGraphData()
 				if (sbChill[sbChill.Length - 1] == ',')
 					sbChill.Length--;
 
-				sbChill.Append("]");
+				sbChill.Append(']');
 				sb.Append((append ? "," : "") + sbChill);
 				append = true;
 			}
@@ -2559,7 +2556,7 @@ public string GetTempGraphData()
 				if (sbHeat[sbHeat.Length - 1] == ',')
 					sbHeat.Length--;
 
-				sbHeat.Append("]");
+				sbHeat.Append(']');
 				sb.Append((append ? "," : "") + sbHeat);
 				append = true;
 			}
@@ -2569,7 +2566,7 @@ public string GetTempGraphData()
 				if (sbTemp[sbTemp.Length - 1] == ',')
 					sbTemp.Length--;
 
-				sbTemp.Append("]");
+				sbTemp.Append(']');
 				sb.Append((append ? "," : "") + sbTemp);
 				append = true;
 			}
@@ -2579,11 +2576,11 @@ public string GetTempGraphData()
 				if (sbHumidex[sbHumidex.Length - 1] == ',')
 					sbHumidex.Length--;
 
-				sbHumidex.Append("]");
+				sbHumidex.Append(']');
 				sb.Append((append ? "," : "") + sbHumidex);
 			}
 
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -2622,7 +2619,7 @@ public string GetAqGraphData()
 				if (sb2p5[sb2p5.Length - 1] == ',')
 					sb2p5.Length--;
 
-				sb2p5.Append("]");
+				sb2p5.Append(']');
 				sb.Append(sb2p5);
 
 				if (append)
@@ -2630,13 +2627,13 @@ public string GetAqGraphData()
 					if (sb10[sb10.Length - 1] == ',')
 						sb10.Length--;
 
-					sb10.Append("]");
+					sb10.Append(']');
 					sb.Append(sb10);
 				}
 
 			}
 
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -4051,10 +4048,8 @@ public void DoWind(double gustpar, int bearingpar, double speedpar, DateTime tim
 			var uncalibratedgust = gustpar;
 			calibratedgust = uncalibratedgust * cumulus.Calib.WindGust.Mult;
 
-			// If we are using speed for average it means the gustpar is a period gust value not a latest.
-			// So we have to use the speed for the latest
-			WindLatest = cumulus.StationOptions.UseSpeedForAvgCalc ? speedpar * cumulus.Calib.WindSpeed.Mult : calibratedgust;
-			
+			WindLatest = cumulus.StationOptions.UseSpeedForLatest ? speedpar * cumulus.Calib.WindSpeed.Mult : calibratedgust;
+
 			windspeeds[nextwindvalue] = gustpar;
 			windbears[nextwindvalue] = Bearing;
 
@@ -4300,14 +4295,12 @@ public void DoUV(double value, DateTime timestamp)
 		public void DoSolarRad(int value, DateTime timestamp)
 		{
 			SolarRad = (value * cumulus.Calib.Solar.Mult) + cumulus.Calib.Solar.Offset;
-			// Update display
 
 			if (SolarRad > HiLoToday.HighSolar)
 			{
 				HiLoToday.HighSolar = SolarRad;
 				HiLoToday.HighSolarTime = timestamp;
 			}
-			CurrentSolarMax = AstroLib.SolarMax(timestamp, cumulus.Longitude, cumulus.Latitude, AltitudeM(cumulus.Altitude), out SolarElevation, cumulus.SolarOptions);
 
 			if (!cumulus.SolarOptions.UseBlakeLarsen)
 			{
@@ -5732,7 +5725,7 @@ private async void DoDayfile(DateTime timestamp)
 				queryString.Append(HiLoToday.HighHumidex.ToString(cumulus.TempFormat, InvC) + ",");
 				queryString.Append(HiLoToday.HighHumidexTime.ToString("\\'HH:mm\\'"));
 
-				queryString.Append(")");
+				queryString.Append(')');
 
 				// run the query async so we do not block the main EOD processing
 				_ = cumulus.MySqlCommandAsync(queryString.ToString(), "MySQL Dayfile");
@@ -6531,6 +6524,7 @@ public void DoDayResetIfNeeded()
 		public int ConsecutiveDryDays { get; set; }
 		public DateTime FOSensorClockTime { get; set; }
 		public DateTime FOStationClockTime { get; set; }
+		public DateTime FOSolarClockTime { get; set; }
 		public double YestAvgTemp { get; set; }
 		public double AltimeterPressure { get; set; }
 		public int YestDominantWindBearing { get; set; }
@@ -8765,7 +8759,7 @@ public string GetAwekasURLv4(out string pwstring, DateTime timestamp)
 
 			if (cumulus.AWEKAS.SendSoilTemp)
 			{
-				if (started) sb.Append("&"); else started = true;
+				if (started) sb.Append('&'); else started = true;
 				for (var i = 1; i <= 4; i++)
 				{
 					sb.Append($"soiltemp{i}=" + ConvertUserTempToC(SoilTemp[i]).ToString("F1", InvC));
@@ -8774,7 +8768,7 @@ public string GetAwekasURLv4(out string pwstring, DateTime timestamp)
 
 			if (cumulus.AWEKAS.SendSoilMoisture)
 			{
-				if (started) sb.Append("&"); else started = true;
+				if (started) sb.Append('&'); else started = true;
 				sb.Append("soilmoisture1=" + SoilMoisture1);
 				sb.Append("&soilmoisture2=" + SoilMoisture2);
 				sb.Append("&soilmoisture3=" + SoilMoisture3);
@@ -8783,7 +8777,7 @@ public string GetAwekasURLv4(out string pwstring, DateTime timestamp)
 
 			if (cumulus.AWEKAS.SendLeafWetness)
 			{
-				if (started) sb.Append("&"); else started = true;
+				if (started) sb.Append('&'); else started = true;
 				sb.Append("leafwetness1=" + LeafWetness1.ToString(cumulus.LeafWetFormat));
 				sb.Append("&leafwetness2=" + LeafWetness2.ToString(cumulus.LeafWetFormat));
 				sb.Append("&leafwetness3=" + LeafWetness3.ToString(cumulus.LeafWetFormat));
@@ -8792,7 +8786,7 @@ public string GetAwekasURLv4(out string pwstring, DateTime timestamp)
 
 			if (cumulus.AWEKAS.SendAirQuality)
 			{
-				if (started) sb.Append("&"); else started = true;
+				if (started) sb.Append('&'); else started = true;
 
 				switch (cumulus.StationOptions.PrimaryAqSensor)
 				{
@@ -8831,7 +8825,7 @@ public string GetAwekasURLv4(out string pwstring, DateTime timestamp)
 				}
 			}
 
-			if (started) sb.Append("&");
+			if (started) sb.Append('&');
 			sb.Append("output=json&val=");
 
 			//
@@ -9412,7 +9406,7 @@ public string GetHumRecords()
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(alltimejsonformat(AllTime.HighHumidity, "%", cumulus.HumFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.LowHumidity, "%", cumulus.HumFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9423,7 +9417,7 @@ public string GetPressRecords()
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(alltimejsonformat(AllTime.HighPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.LowPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9434,9 +9428,9 @@ public string GetWindRecords()
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(alltimejsonformat(AllTime.HighGust, cumulus.Units.WindText, cumulus.WindFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.HighWind, cumulus.Units.WindText, cumulus.WindAvgFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.HighWindRun, cumulus.Units.WindRunText, cumulus.WindRunFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9447,17 +9441,17 @@ public string GetRainRecords()
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(alltimejsonformat(AllTime.HighRainRate, cumulus.Units.RainText + "/hr", cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.HourlyRain, cumulus.Units.RainText, cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.DailyRain, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.Rain24Hours, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.MonthlyRain, cumulus.Units.RainText, cumulus.RainFormat, "Y"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.LongestDryPeriod, "days", "f0", "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(alltimejsonformat(AllTime.LongestWetPeriod, "days", "f0", "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9473,33 +9467,33 @@ public string GetMonthlyTempRecords(int month)
 			var json = new StringBuilder("{\"data\":[", 1024);
 
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighDewPoint, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowDewPoint, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighAppTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowAppTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighFeelsLike, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowFeelsLike, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighHumidex, "&nbsp;", cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowChill, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighHeatIndex, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighMinTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowMaxTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighDailyTempRange, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowDailyTempRange, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9510,7 +9504,7 @@ public string GetMonthlyHumRecords(int month)
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighHumidity, "%", cumulus.HumFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowHumidity, "%", cumulus.HumFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9521,7 +9515,7 @@ public string GetMonthlyPressRecords(int month)
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LowPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9532,9 +9526,9 @@ public string GetMonthlyWindRecords(int month)
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighGust, cumulus.Units.WindText, cumulus.WindFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighWind, cumulus.Units.WindText, cumulus.WindAvgFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighWindRun, cumulus.Units.WindRunText, cumulus.WindRunFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9545,17 +9539,17 @@ public string GetMonthlyRainRecords(int month)
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HighRainRate, cumulus.Units.RainText + "/hr", cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].HourlyRain, cumulus.Units.RainText, cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].DailyRain, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].Rain24Hours, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].MonthlyRain, cumulus.Units.RainText, cumulus.RainFormat, "Y"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LongestDryPeriod, "days", "f0", "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthlyjsonformat(MonthlyRecs[month].LongestWetPeriod, "days", "f0", "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9571,33 +9565,33 @@ public string GetThisMonthTempRecords()
 			var json = new StringBuilder("{\"data\":[", 1024);
 
 			json.Append(monthyearjsonformat(ThisMonth.HighTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighDewPoint, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowDewPoint, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighAppTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowAppTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighFeelsLike, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowFeelsLike, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighHumidex, "&nbsp;", cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowChill, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighHeatIndex, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighMinTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowMaxTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighDailyTempRange, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowDailyTempRange, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9608,7 +9602,7 @@ public string GetThisMonthHumRecords()
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthyearjsonformat(ThisMonth.HighHumidity, "%", cumulus.HumFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowHumidity, "%", cumulus.HumFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9619,7 +9613,7 @@ public string GetThisMonthPressRecords()
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthyearjsonformat(ThisMonth.HighPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LowPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9630,9 +9624,9 @@ public string GetThisMonthWindRecords()
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthyearjsonformat(ThisMonth.HighGust, cumulus.Units.WindText, cumulus.WindFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighWind, cumulus.Units.WindText, cumulus.WindAvgFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HighWindRun, cumulus.Units.WindRunText, cumulus.WindRunFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9643,17 +9637,17 @@ public string GetThisMonthRainRecords()
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(monthyearjsonformat(ThisMonth.HighRainRate, cumulus.Units.RainText + "/hr", cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.HourlyRain, cumulus.Units.RainText, cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.DailyRain, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.Rain24Hours, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			//json.Append(monthyearjsonformat(ThisMonth.WetMonth.Desc, month, cumulus.Units.RainText, cumulus.RainFormat, "Y"));
-			//json.Append(",");
+			//json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LongestDryPeriod, "days", "f0", "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisMonth.LongestWetPeriod, "days", "f0", "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9664,33 +9658,33 @@ public string GetThisYearTempRecords()
 			var json = new StringBuilder("{\"data\":[", 1024);
 
 			json.Append(monthyearjsonformat(ThisYear.HighTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighDewPoint, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowDewPoint, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighAppTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowAppTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighFeelsLike, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowFeelsLike, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighHumidex, "&nbsp;", cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowChill, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighHeatIndex, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighMinTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowMaxTemp, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighDailyTempRange, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowDailyTempRange, "&deg;" + cumulus.Units.TempText[1].ToString(), cumulus.TempFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9701,7 +9695,7 @@ public string GetThisYearHumRecords()
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthyearjsonformat(ThisYear.HighHumidity, "%", cumulus.HumFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowHumidity, "%", cumulus.HumFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9712,7 +9706,7 @@ public string GetThisYearPressRecords()
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthyearjsonformat(ThisYear.HighPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LowPress, cumulus.Units.PressText, cumulus.PressFormat, "f"));
 			json.Append("]}");
 			return json.ToString();
@@ -9723,9 +9717,9 @@ public string GetThisYearWindRecords()
 			var json = new StringBuilder("{\"data\":[", 256);
 
 			json.Append(monthyearjsonformat(ThisYear.HighGust, cumulus.Units.WindText, cumulus.WindFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighWind, cumulus.Units.WindText, cumulus.WindAvgFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HighWindRun, cumulus.Units.WindRunText, cumulus.WindRunFormat, "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9736,17 +9730,17 @@ public string GetThisYearRainRecords()
 			var json = new StringBuilder("{\"data\":[", 512);
 
 			json.Append(monthyearjsonformat(ThisYear.HighRainRate, cumulus.Units.RainText + "/hr", cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.HourlyRain, cumulus.Units.RainText, cumulus.RainFormat, "f"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.DailyRain, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.Rain24Hours, cumulus.Units.RainText, cumulus.RainFormat, "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.MonthlyRain, cumulus.Units.RainText, cumulus.RainFormat, "Y"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LongestDryPeriod, "days", "f0", "D"));
-			json.Append(",");
+			json.Append(',');
 			json.Append(monthyearjsonformat(ThisYear.LongestWetPeriod, "days", "f0", "D"));
 			json.Append("]}");
 			return json.ToString();
@@ -9768,7 +9762,7 @@ public string GetExtraTemp()
 
 				if (sensor < 10)
 				{
-					json.Append(",");
+					json.Append(',');
 				}
 			}
 
@@ -9792,7 +9786,7 @@ public string GetUserTemp()
 
 				if (sensor < 8)
 				{
-					json.Append(",");
+					json.Append(',');
 				}
 			}
 
@@ -9814,7 +9808,7 @@ public string GetExtraHum()
 
 				if (sensor < 10)
 				{
-					json.Append(",");
+					json.Append(',');
 				}
 			}
 
@@ -9838,7 +9832,7 @@ public string GetExtraDew()
 
 				if (sensor < 10)
 				{
-					json.Append(",");
+					json.Append(',');
 				}
 			}
 
@@ -10447,7 +10441,7 @@ public string GetDayfile(string draw, int start, int length)
 						json.Append($"\"{fields[i]}\"");
 						if (i < fields.Length - 1)
 						{
-							json.Append(",");
+							json.Append(',');
 						}
 					}
 
@@ -10710,7 +10704,7 @@ public string GetUnits()
 		public string GetGraphConfig()
 		{
 			var json = new StringBuilder(200);
-			json.Append("{");
+			json.Append('{');
 			json.Append($"\"temp\":{{\"units\":\"{cumulus.Units.TempText[1]}\",\"decimals\":{cumulus.TempDPlaces}}},");
 			json.Append($"\"wind\":{{\"units\":\"{cumulus.Units.WindText}\",\"decimals\":{cumulus.WindAvgDPlaces},\"rununits\":\"{cumulus.Units.WindRunText}\"}},");
 			json.Append($"\"rain\":{{\"units\":\"{cumulus.Units.RainText}\",\"decimals\":{cumulus.RainDPlaces}}},");
@@ -10795,7 +10789,7 @@ public string GetAvailGraphData()
 				if (json[json.Length - 1] == ',')
 					json.Length--;
 
-				json.Append("]");
+				json.Append(']');
 			}
 
 
@@ -10813,7 +10807,7 @@ public string GetAvailGraphData()
 				if (json[json.Length - 1] == ',')
 					json.Length--;
 
-				json.Append("]");
+				json.Append(']');
 			}
 
 			// Sunshine
@@ -10837,7 +10831,7 @@ public string GetAvailGraphData()
 				{
 					json.Append(",\"PM 10\"");
 				}
-				json.Append("]");
+				json.Append(']');
 			}
 
 			// Degree Days
@@ -10853,7 +10847,7 @@ public string GetAvailGraphData()
 				if (json[json.Length - 1] == ',')
 					json.Length--;
 
-				json.Append("]");
+				json.Append(']');
 			}
 
 			// Temp Sum
@@ -10870,10 +10864,10 @@ public string GetAvailGraphData()
 				if (json[json.Length - 1] == ',')
 					json.Length--;
 
-				json.Append("]");
+				json.Append(']');
 			}
 
-			json.Append("}");
+			json.Append('}');
 			return json.ToString();
 		}
 
@@ -10894,11 +10888,13 @@ public string GetDailyRainGraphData()
 			var data = DayFile.Where(rec => rec.Date >= datefrom).ToList();
 			for (var i = 0; i < data.Count; i++)
 			{
-				sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].TotalRain.ToString(cumulus.RainFormat, InvC)}]");
-
-				if (i < data.Count - 1)
-					sb.Append(",");
+				sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].TotalRain.ToString(cumulus.RainFormat, InvC)}],");
 			}
+
+			// remove trailing comma
+			if (sb[sb.Length - 1] == ',')
+				sb.Length--;
+			
 			sb.Append("]}");
 			return sb.ToString();
 		}
@@ -10916,14 +10912,16 @@ public string GetSunHoursGraphData()
 				for (var i = 0; i < data.Count; i++)
 				{
 					var sunhrs = data[i].SunShineHours >= 0 ? data[i].SunShineHours : 0;
-					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{sunhrs.ToString(cumulus.SunFormat, InvC)}]");
-
-					if (i < data.Count - 1)
-						sb.Append(",");
+					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{sunhrs.ToString(cumulus.SunFormat, InvC)}],");
 				}
-				sb.Append("]");
+				sb.Append(']');
 			}
-			sb.Append("}");
+
+			// remove trailing comma
+			if (sb[sb.Length - 1] == ',')
+				sb.Length--;
+
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -10941,50 +10939,56 @@ public string GetDailyTempGraphData()
 
 				for (var i = 0; i < data.Count; i++)
 				{
-					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].LowTemp.ToString(cumulus.TempFormat, InvC)}]");
-					if (i < data.Count - 1)
-						sb.Append(",");
+					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].LowTemp.ToString(cumulus.TempFormat, InvC)}],");
 				}
 
-				sb.Append("]");
+				// remove trailing comma
+				if (sb[sb.Length - 1] == ',')
+					sb.Length--;
+
+				sb.Append(']');
 				append = true;
 			}
 
 			if (cumulus.GraphOptions.DailyMaxTempVisible)
 			{
 				if (append)
-					sb.Append(",");
+					sb.Append(',');
 
 				sb.Append("\"maxtemp\":[");
 
 				for (var i = 0; i < data.Count; i++)
 				{
-					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].HighTemp.ToString(cumulus.TempFormat, InvC)}]");
-					if (i < data.Count - 1)
-						sb.Append(",");
+					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].HighTemp.ToString(cumulus.TempFormat, InvC)}],");
 				}
 
-				sb.Append("]");
+				// remove trailing comma
+				if (sb[sb.Length - 1] == ',')
+					sb.Length--;
+
+				sb.Append(']');
 				append = true;
 			}
 
 			if (cumulus.GraphOptions.DailyAvgTempVisible)
 			{
 				if (append)
-					sb.Append(",");
+					sb.Append(',');
 
 				sb.Append("\"avgtemp\":[");
 				for (var i = 0; i < data.Count; i++)
 				{
-					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].AvgTemp.ToString(cumulus.TempFormat, InvC)}]");
-					if (i < data.Count - 1)
-						sb.Append(",");
+					sb.Append($"[{DateTimeToUnix(data[i].Date) * 1000},{data[i].AvgTemp.ToString(cumulus.TempFormat, InvC)}],");
 				}
 
-				sb.Append("]");
+				// remove trailing comma
+				if (sb[sb.Length - 1] == ',')
+					sb.Length--;
+
+				sb.Append(']');
 			}
 
-			sb.Append("}");
+			sb.Append('}');
 			return sb.ToString();
 		}
 
@@ -11023,119 +11027,92 @@ public string GetAllDailyTempGraphData()
 					var recDate = DateTimeToUnix(DayFile[i].Date) * 1000;
 					// lo temp
 					if (cumulus.GraphOptions.DailyMinTempVisible)
-						minTemp.Append($"[{recDate},{DayFile[i].LowTemp.ToString(cumulus.TempFormat, InvC)}]");
+						minTemp.Append($"[{recDate},{DayFile[i].LowTemp.ToString(cumulus.TempFormat, InvC)}],");
 					// hi temp
 					if (cumulus.GraphOptions.DailyMaxTempVisible)
-						maxTemp.Append($"[{recDate},{DayFile[i].HighTemp.ToString(cumulus.TempFormat, InvC)}]");
+						maxTemp.Append($"[{recDate},{DayFile[i].HighTemp.ToString(cumulus.TempFormat, InvC)}],");
 					// avg temp
 					if (cumulus.GraphOptions.DailyAvgTempVisible)
-						avgTemp.Append($"[{recDate},{DayFile[i].AvgTemp.ToString(cumulus.TempFormat, InvC)}]");
-
-					if (i < len)
-					{
-						minTemp.Append(",");
-						maxTemp.Append(",");
-						avgTemp.Append(",");
-					}
+						avgTemp.Append($"[{recDate},{DayFile[i].AvgTemp.ToString(cumulus.TempFormat, InvC)}],");
 
 					if (cumulus.GraphOptions.HIVisible)
 					{
 						// hi heat index
 						if (DayFile[i].HighHeatIndex > -999)
-							heatIdx.Append($"[{recDate},{DayFile[i].HighHeatIndex.ToString(cumulus.TempFormat, InvC)}]");
+							heatIdx.Append($"[{recDate},{DayFile[i].HighHeatIndex.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							heatIdx.Append($"[{recDate},null]");
-
-						if (i < len)
-							heatIdx.Append(",");
+							heatIdx.Append($"[{recDate},null],");
 					}
 					if (cumulus.GraphOptions.AppTempVisible)
 					{
 						// hi app temp
 						if (DayFile[i].HighAppTemp > -999)
-							maxApp.Append($"[{recDate},{DayFile[i].HighAppTemp.ToString(cumulus.TempFormat, InvC)}]");
+							maxApp.Append($"[{recDate},{DayFile[i].HighAppTemp.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							maxApp.Append($"[{recDate},null]");
+							maxApp.Append($"[{recDate},null],");
 
 						// lo app temp
 						if (DayFile[i].LowAppTemp < 999)
-							minApp.Append($"[{recDate},{DayFile[i].LowAppTemp.ToString(cumulus.TempFormat, InvC)}]");
+							minApp.Append($"[{recDate},{DayFile[i].LowAppTemp.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							minApp.Append($"[{recDate},null]");
-
-						if (i < len)
-						{
-							maxApp.Append(",");
-							minApp.Append(",");
-						}
+							minApp.Append($"[{recDate},null],");
 					}
 					// lo wind chill
 					if (cumulus.GraphOptions.WCVisible)
 					{
 						if (DayFile[i].LowWindChill < 999)
-							windChill.Append($"[{recDate},{DayFile[i].LowWindChill.ToString(cumulus.TempFormat, InvC)}]");
+							windChill.Append($"[{recDate},{DayFile[i].LowWindChill.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							windChill.Append($"[{recDate},null]");
-
-						if (i < len)
-							windChill.Append(",");
+							windChill.Append($"[{recDate},null],");
 					}
 
 					if (cumulus.GraphOptions.DPVisible)
 					{
 						// hi dewpt
 						if (DayFile[i].HighDewPoint > -999)
-							maxDew.Append($"[{recDate},{DayFile[i].HighDewPoint.ToString(cumulus.TempFormat, InvC)}]");
+							maxDew.Append($"[{recDate},{DayFile[i].HighDewPoint.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							maxDew.Append($"[{recDate},null]");
+							maxDew.Append($"[{recDate},null],");
 
 						// lo dewpt
 						if (DayFile[i].LowDewPoint < 999)
-							minDew.Append($"[{recDate},{DayFile[i].LowDewPoint.ToString(cumulus.TempFormat, InvC)}]");
+							minDew.Append($"[{recDate},{DayFile[i].LowDewPoint.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							minDew.Append($"[{recDate},null]");
-
-						if (i < len)
-						{
-							maxDew.Append(",");
-							minDew.Append(",");
-						}
+							minDew.Append($"[{recDate},null],");
 					}
 
 					if (cumulus.GraphOptions.FeelsLikeVisible)
 					{
 						// hi feels like
 						if (DayFile[i].HighFeelsLike > -999)
-							maxFeels.Append($"[{recDate},{DayFile[i].HighFeelsLike.ToString(cumulus.TempFormat, InvC)}]");
+							maxFeels.Append($"[{recDate},{DayFile[i].HighFeelsLike.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							maxFeels.Append($"[{recDate},null]");
+							maxFeels.Append($"[{recDate},null],");
 
 						// lo feels like
 						if (DayFile[i].LowFeelsLike < 999)
-							minFeels.Append($"[{recDate},{DayFile[i].LowFeelsLike.ToString(cumulus.TempFormat, InvC)}]");
+							minFeels.Append($"[{recDate},{DayFile[i].LowFeelsLike.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							minFeels.Append($"[{recDate},null]");
-
-						if (i < len)
-						{
-							maxFeels.Append(",");
-							minFeels.Append(",");
-						}
+							minFeels.Append($"[{recDate},null],");
 					}
 
 					if (cumulus.GraphOptions.HumidexVisible)
 					{
 						// hi humidex
 						if (DayFile[i].HighHumidex > -999)
-							humidex.Append($"[{recDate},{DayFile[i].HighHumidex.ToString(cumulus.TempFormat, InvC)}]");
+							humidex.Append($"[{recDate},{DayFile[i].HighHumidex.ToString(cumulus.TempFormat, InvC)}],");
 						else
-							humidex.Append($"[{recDate},null]");
-
-						if (i < len)
-							humidex.Append(",");
+							humidex.Append($"[{recDate},null],");
 					}
 				}
 			}
+
+			// remove trailing commas
+			minTemp.Length--;
+			maxTemp.Length--;
+			avgTemp.Length--;
+
+
 			if (cumulus.GraphOptions.DailyMinTempVisible)
 				sb.Append("\"minTemp\":" + minTemp.ToString() + "],");
 			if (cumulus.GraphOptions.DailyMaxTempVisible)
@@ -11143,29 +11120,44 @@ public string GetAllDailyTempGraphData()
 			if (cumulus.GraphOptions.DailyAvgTempVisible)
 				sb.Append("\"avgTemp\":" + avgTemp.ToString() + "],");
 			if (cumulus.GraphOptions.HIVisible)
+			{
+				heatIdx.Length--;
 				sb.Append("\"heatIndex\":" + heatIdx.ToString() + "],");
+			}
 			if (cumulus.GraphOptions.AppTempVisible)
 			{
+				maxApp.Length--;
+				minApp.Length--;
 				sb.Append("\"maxApp\":" + maxApp.ToString() + "],");
 				sb.Append("\"minApp\":" + minApp.ToString() + "],");
 			}
 			if (cumulus.GraphOptions.WCVisible)
+			{
+				windChill.Length--;
 				sb.Append("\"windChill\":" + windChill.ToString() + "],");
+			}
 			if (cumulus.GraphOptions.DPVisible)
 			{
+				maxDew.Length--;
+				minDew.Length--;
 				sb.Append("\"maxDew\":" + maxDew.ToString() + "],");
 				sb.Append("\"minDew\":" + minDew.ToString() + "],");
 			}
 			if (cumulus.GraphOptions.FeelsLikeVisible)
 			{
+				maxFeels.Length--;
+				minFeels.Length--;
 				sb.Append("\"maxFeels\":" + maxFeels.ToString() + "],");
 				sb.Append("\"minFeels\":" + minFeels.ToString() + "],");
 			}
 			if (cumulus.GraphOptions.HumidexVisible)
+			{
+				humidex.Length--;
 				sb.Append("\"humidex\":" + humidex.ToString() + "],");
+			}
 
 			sb.Length--;
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11197,24 +11189,22 @@ public string GetAllDailyWindGraphData()
 					var recDate = DateTimeToUnix(DayFile[i].Date) * 1000;
 
 					// hi gust
-					maxGust.Append($"[{recDate},{DayFile[i].HighGust.ToString(cumulus.WindFormat, InvC)}]");
+					maxGust.Append($"[{recDate},{DayFile[i].HighGust.ToString(cumulus.WindFormat, InvC)}],");
 					// hi wind run
-					windRun.Append($"[{recDate},{DayFile[i].WindRun.ToString(cumulus.WindRunFormat, InvC)}]");
+					windRun.Append($"[{recDate},{DayFile[i].WindRun.ToString(cumulus.WindRunFormat, InvC)}],");
 					// hi wind
-					maxWind.Append($"[{recDate},{DayFile[i].HighAvgWind.ToString(cumulus.WindAvgFormat, InvC)}]");
-
-					if (i < len)
-					{
-						maxGust.Append(",");
-						windRun.Append(",");
-						maxWind.Append(",");
-					}
+					maxWind.Append($"[{recDate},{DayFile[i].HighAvgWind.ToString(cumulus.WindAvgFormat, InvC)}],");
 				}
 			}
+
+			maxGust.Length--;
+			windRun.Length--;
+			maxWind.Length--;
+
 			sb.Append("\"maxGust\":" + maxGust.ToString() + "],");
 			sb.Append("\"windRun\":" + windRun.ToString() + "],");
 			sb.Append("\"maxWind\":" + maxWind.ToString() + "]");
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11246,20 +11236,18 @@ public string GetAllDailyRainGraphData()
 					long recDate = DateTimeToUnix(DayFile[i].Date) * 1000;
 
 					// hi rain rate
-					maxRRate.Append($"[{recDate},{DayFile[i].HighRainRate.ToString(cumulus.RainFormat, InvC)}]");
+					maxRRate.Append($"[{recDate},{DayFile[i].HighRainRate.ToString(cumulus.RainFormat, InvC)}],");
 					// total rain
-					rain.Append($"[{recDate},{DayFile[i].TotalRain.ToString(cumulus.RainFormat, InvC)}]");
-
-					if (i < len)
-					{
-						maxRRate.Append(",");
-						rain.Append(",");
-					}
+					rain.Append($"[{recDate},{DayFile[i].TotalRain.ToString(cumulus.RainFormat, InvC)}],");
 				}
 			}
+
+			maxRRate.Length--;
+			rain.Length--;
+
 			sb.Append("\"maxRainRate\":" + maxRRate.ToString() + "],");
 			sb.Append("\"rain\":" + rain.ToString() + "]");
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11292,83 +11280,58 @@ public string GetAllDailyPressGraphData()
 					long recDate = DateTimeToUnix(DayFile[i].Date) * 1000;
 
 					// lo baro
-					minBaro.Append($"[{recDate},{DayFile[i].LowPress.ToString(cumulus.PressFormat, InvC)}]");
+					minBaro.Append($"[{recDate},{DayFile[i].LowPress.ToString(cumulus.PressFormat, InvC)}],");
 					// hi baro
-					maxBaro.Append($"[{recDate},{DayFile[i].HighPress.ToString(cumulus.PressFormat, InvC)}]");
-
-					if (i < len)
-					{
-						maxBaro.Append(",");
-						minBaro.Append(",");
-					}
+					maxBaro.Append($"[{recDate},{DayFile[i].HighPress.ToString(cumulus.PressFormat, InvC)}],");
 				}
 			}
+
+			// Remove trailing commas
+			minBaro.Length--;
+			maxBaro.Length--;
 			sb.Append("\"minBaro\":" + minBaro.ToString() + "],");
 			sb.Append("\"maxBaro\":" + maxBaro.ToString() + "]");
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
 
-		//public string GetAllDailyWindDirGraphData()
-		//{
-		//	int linenum = 0;
-		//	int valInt;
-
-		//	/* returns:
-		//	 *	{
-		//	 *		highgust:[[date1,val1],[date2,val2]...],
-		//	 *		mintemp:[[date1,val1],[date2,val2]...],
-		//	 *		etc
-		//	 *	}
-		//	 */
-
-		//	StringBuilder sb = new StringBuilder("{");
-		//	StringBuilder windDir = new StringBuilder("[");
-
-		//	var watch = Stopwatch.StartNew();
-
-		//	// Read the dayfile and extract the records from there
-		//	if (File.Exists(cumulus.DayFile))
-		//	{
-		//		try
-		//		{
-		//			var dayfile = File.ReadAllLines(cumulus.DayFile);
-
-		//			foreach (var line in dayfile)
-		//			{
-		//				linenum++;
-		//				List<string> st = new List<string>(Regex.Split(line, CultureInfo.CurrentCulture.TextInfo.ListSeparator));
-
-		//				if (st.Count <= 0) continue;
-
-		//				// dominant wind direction
-		//				if (st.Count > 39)
-		//				{
-		//					long recDate = DateTimeToUnix(ddmmyyStrToDate(st[0])) * 1000;
-
-		//					if (int.TryParse(st[39], out valInt))
-		//						windDir.Append($"[{recDate},{valInt}]");
-		//					else
-		//						windDir.Append($"[{recDate},null]");
-		//					if (linenum < dayfile.Length)
-		//						windDir.Append(",");
-		//				}
-		//			}
-		//		}
-		//		catch (Exception e)
-		//		{
-		//			cumulus.LogMessage("GetAllDailyWindDirGraphData: Error on line " + linenum + " of " + cumulus.DayFile + ": " + e.Message);
-		//		}
-		//	}
-		//	sb.Append("\"windDir\":" + windDir.ToString() + "]");
-		//	sb.Append("}");
-
-		//	watch.Stop();
-		//	cumulus.LogDebugMessage($"GetAllDailyWindDirGraphData: Dayfile parse = {watch.ElapsedMilliseconds} ms");
-
-		//	return sb.ToString();
-		//}
+		public string GetAllDailyWindDirGraphData()
+		{
+
+			/* returns:
+			 *	{
+			 *		highgust:[[date1,val1],[date2,val2]...],
+			 *		mintemp:[[date1,val1],[date2,val2]...],
+			 *		etc
+			 *	}
+			 */
+
+			StringBuilder sb = new StringBuilder("{");
+			StringBuilder windDir = new StringBuilder("[");
+
+
+			// Read the dayfile and extract the records from there
+			if (DayFile.Count() > 0)
+			{
+				var len = DayFile.Count() - 1;
+
+				for (var i = 0; i < DayFile.Count(); i++)
+				{
+					long recDate = DateTimeToUnix(DayFile[i].Date) * 1000;
+
+					windDir.Append($"[{recDate},{DayFile[i].DominantWindBearing.ToString()}],");
+
+				}
+			}
+
+			// Remove trailing commas
+			windDir.Length--;
+			sb.Append("\"windDir\":" + windDir.ToString() + "]");
+			sb.Append('}');
+
+			return sb.ToString();
+		}
 
 		public string GetAllDailyHumGraphData()
 		{
@@ -11395,20 +11358,18 @@ public string GetAllDailyHumGraphData()
 					long recDate = DateTimeToUnix(DayFile[i].Date) * 1000;
 
 					// lo humidity
-					minHum.Append($"[{recDate},{DayFile[i].LowHumidity}]");
+					minHum.Append($"[{recDate},{DayFile[i].LowHumidity}],");
 					// hi humidity
-					maxHum.Append($"[{recDate},{DayFile[i].HighHumidity}]");
-
-					if (i < len)
-					{
-						minHum.Append(",");
-						maxHum.Append(",");
-					}
+					maxHum.Append($"[{recDate},{DayFile[i].HighHumidity}],");
 				}
 			}
+			// Remove trailing commas
+			minHum.Length--;
+			maxHum.Length--;
+
 			sb.Append("\"minHum\":" + minHum.ToString() + "],");
 			sb.Append("\"maxHum\":" + maxHum.ToString() + "]");
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11442,47 +11403,47 @@ public string GetAllDailySolarGraphData()
 					if (cumulus.GraphOptions.SunshineVisible)
 					{
 						// sunshine hours
-						sunHours.Append($"[{recDate},{DayFile[i].SunShineHours.ToString(InvC)}]");
-						if (i < len)
-							sunHours.Append(",");
+						sunHours.Append($"[{recDate},{DayFile[i].SunShineHours.ToString(InvC)}],");
 					}
 
 					if (cumulus.GraphOptions.SolarVisible)
 					{
 						// hi solar rad
-						solarRad.Append($"[{recDate},{DayFile[i].HighSolar}]");
-						if (i < len)
-							solarRad.Append(",");
+						solarRad.Append($"[{recDate},{DayFile[i].HighSolar}],");
 					}
 
 					if (cumulus.GraphOptions.UVVisible)
 					{
 						// hi UV-I
-						uvi.Append($"[{recDate},{DayFile[i].HighUv.ToString(cumulus.UVFormat, InvC)}]");
-						if (i < len)
-							uvi.Append(",");
+						uvi.Append($"[{recDate},{DayFile[i].HighUv.ToString(cumulus.UVFormat, InvC)}],");
 					}
 				}
 			}
+
 			if (cumulus.GraphOptions.SunshineVisible)
+			{
+				sunHours.Length--;
 				sb.Append("\"sunHours\":" + sunHours.ToString() + "]");
+			}
 
 			if (cumulus.GraphOptions.SolarVisible)
 			{
 				if (cumulus.GraphOptions.SunshineVisible)
-					sb.Append(",");
+					sb.Append(',');
 
+				solarRad.Length--;
 				sb.Append("\"solarRad\":" + solarRad.ToString() + "]");
 			}
 
 			if (cumulus.GraphOptions.UVVisible)
 			{
 				if (cumulus.GraphOptions.SunshineVisible || cumulus.GraphOptions.SolarVisible)
-					sb.Append(",");
+					sb.Append(',');
 
+				uvi.Length--;
 				sb.Append("\"uvi\":" + uvi.ToString() + "]");
 			}
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11628,7 +11589,7 @@ public string GetAllDegreeDaysGraphData()
 				// have previous years been appended?
 				if (growdegdaysYears1[growdegdaysYears1.Length - 1] == ']')
 				{
-					growdegdaysYears1.Append(",");
+					growdegdaysYears1.Append(',');
 				}
 
 				growdegdaysYears1.Append(growYear1 + "]");
@@ -11646,7 +11607,7 @@ public string GetAllDegreeDaysGraphData()
 				// have previous years been appended?
 				if (growdegdaysYears2[growdegdaysYears2.Length - 1] == ']')
 				{
-					growdegdaysYears2.Append(",");
+					growdegdaysYears2.Append(',');
 				}
 				growdegdaysYears2.Append(growYear2 + "]");
 
@@ -11656,7 +11617,7 @@ public string GetAllDegreeDaysGraphData()
 
 			sb.Append(options);
 
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11815,7 +11776,7 @@ public string GetAllTempSumGraphData()
 				// have previous years been appended?
 				if (tempSumYears0[tempSumYears0.Length - 1] == ']')
 				{
-					tempSumYears0.Append(",");
+					tempSumYears0.Append(',');
 				}
 
 				tempSumYears0.Append(tempSum0 + "]");
@@ -11824,7 +11785,7 @@ public string GetAllTempSumGraphData()
 				sb.Append("\"Sum0\":" + tempSumYears0 + "}");
 
 				if (cumulus.GraphOptions.TempSumVisible1 || cumulus.GraphOptions.TempSumVisible2)
-					sb.Append(",");
+					sb.Append(',');
 			}
 			if (cumulus.GraphOptions.TempSumVisible1)
 			{
@@ -11836,7 +11797,7 @@ public string GetAllTempSumGraphData()
 				// have previous years been appended?
 				if (tempSumYears1[tempSumYears1.Length - 1] == ']')
 				{
-					tempSumYears1.Append(",");
+					tempSumYears1.Append(',');
 				}
 
 				tempSumYears1.Append(tempSum1 + "]");
@@ -11854,7 +11815,7 @@ public string GetAllTempSumGraphData()
 				// have previous years been appended?
 				if (tempSumYears2[tempSumYears2.Length - 1] == ']')
 				{
-					tempSumYears2.Append(",");
+					tempSumYears2.Append(',');
 				}
 
 				tempSumYears2.Append(tempSum2 + "]");
@@ -11865,7 +11826,7 @@ public string GetAllTempSumGraphData()
 
 			sb.Append(options);
 
-			sb.Append("}");
+			sb.Append('}');
 
 			return sb.ToString();
 		}
@@ -11879,7 +11840,7 @@ internal string GetCurrentData()
 			{
 				for (var i = 1; i < cumulus.NumWindRosePoints; i++)
 				{
-					windRoseData.Append(",");
+					windRoseData.Append(',');
 					windRoseData.Append((windcounts[i] * cumulus.Calib.WindGust.Mult).ToString(cumulus.WindFormat, CultureInfo.InvariantCulture));
 				}
 			}
@@ -12073,7 +12034,7 @@ public void UpdateAPRS()
 						message.Append($"r{APRSrain(RainLastHour)}");
 						// rain last 24 hours 0.01 inches pnnn
 						message.Append($"p{APRSrain(RainLast24Hour)}");
-						message.Append("P");
+						message.Append('P');
 						if (cumulus.RolloverHour == 0)
 						{
 							// use today"s rain for safety
diff --git a/CumulusMX/packages.config b/CumulusMX/packages.config
index 64c4137e..38b0ecb1 100644
--- a/CumulusMX/packages.config
+++ b/CumulusMX/packages.config
@@ -2,16 +2,11 @@
 <packages>
   <package id="EmbedIO" version="3.4.3" targetFramework="net48" />
   <package id="HidSharp" version="2.1.0" targetFramework="net452" />
-  <package id="linqtotwitter" version="3.1.1" targetFramework="net45" />
-  <package id="MailKit" version="3.2.0" targetFramework="net48" />
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Compression" version="3.9.85" targetFramework="net45" />
+  <package id="MailKit" version="3.3.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net452" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net452" />
-  <package id="MimeKit" version="3.2.0" targetFramework="net48" />
-  <package id="MQTTnet" version="3.1.2" targetFramework="net48" />
-  <package id="MySqlConnector" version="2.1.9" targetFramework="net48" />
+  <package id="MimeKit" version="3.3.0" targetFramework="net48" />
+  <package id="MQTTnet" version="4.0.1.184" targetFramework="net48" />
+  <package id="MySqlConnector" version="2.1.10" targetFramework="net48" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net48" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
@@ -19,10 +14,10 @@
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="ServiceStack.Text" version="6.1.0" targetFramework="net48" />
-  <package id="SSH.NET" version="2020.0.1" targetFramework="net48" />
+  <package id="SSH.NET" version="2020.0.2" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net48" />
diff --git a/Updates.txt b/Updates.txt
index d53a8024..d67d54e4 100644
--- a/Updates.txt
+++ b/Updates.txt
@@ -1,3 +1,29 @@
+3.19.0 - b3191
+——————————————
+Fixed
+- Ecowitt Extra Sensors setup error 500
+- Broken NOAA reports in dashboard
+- Occasional web socket disconnection in the Dashboard
+- Default web site pages not always fully loading - updated /js/setpagedata.js
+- Ecowitt Local API station failing to start-up correctly when auto-discovery is enabled and the station fails initial discovery
+- Fine Offset console read synchronisation is fixed/changed
+
+New
+- Added the Today/Yesterday page to the default web site
+
+Changed
+- Migrate the log file viewers to the new date picker
+- Default web site menu system - add accessible sub-menus (setpagedata.js)
+- Date selection in NOAA reports
+- Local API: NOAA reports are now returned as plain text rather than a JSON array of strings
+- Dashboard now populated with data on initial page load (also Now and Gauges pages)
+- Davis WLL: Querying the WLL current conditions now avoids times a broadcast is due to be sent as the WLL cannot do both at once
+
+Removed
+- Twitter be gone! Cumulus MX no longer supports Twitter directly
+
+
+
 3.18.0 - b3190
 ——————————————
 - Fix: Adds Ecowitt Wh40 battery state decode