diff --git a/NaturalSort/NaturalComparer.cs b/NaturalSort/NaturalComparer.cs
index caaba5d3..8f4f8101 100644
--- a/NaturalSort/NaturalComparer.cs
+++ b/NaturalSort/NaturalComparer.cs
@@ -48,13 +48,13 @@ namespace NaturalSort
             if (!table.TryGetValue(x, out string[]? x1))
             {
                 //x1 = Regex.Split(x.Replace(" ", string.Empty), "([0-9]+)");
-                x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
+                x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrEmpty(s)).ToArray();
                 table.Add(x, x1);
             }
             if (!table.TryGetValue(y, out string[]? y1))
             {
                 //y1 = Regex.Split(y.Replace(" ", string.Empty), "([0-9]+)");
-                y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
+                y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrEmpty(s)).ToArray();
                 table.Add(y, y1);
             }
 
diff --git a/NaturalSort/NaturalReversedComparer.cs b/NaturalSort/NaturalReversedComparer.cs
index 028e07bb..0ffa8a19 100644
--- a/NaturalSort/NaturalReversedComparer.cs
+++ b/NaturalSort/NaturalReversedComparer.cs
@@ -48,13 +48,13 @@ namespace NaturalSort
             if (!table.TryGetValue(x, out string[]? x1))
             {
                 //x1 = Regex.Split(x.Replace(" ", string.Empty), "([0-9]+)");
-                x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
+                x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrEmpty(s)).ToArray();
                 table.Add(x, x1);
             }
             if (!table.TryGetValue(y, out string[]? y1))
             {
                 //y1 = Regex.Split(y.Replace(" ", string.Empty), "([0-9]+)");
-                y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
+                y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => !string.IsNullOrEmpty(s)).ToArray();
                 table.Add(y, y1);
             }
 
diff --git a/NaturalSort/NaturalSort.csproj b/NaturalSort/NaturalSort.csproj
index 40cefda8..0fdeac31 100644
--- a/NaturalSort/NaturalSort.csproj
+++ b/NaturalSort/NaturalSort.csproj
@@ -1,10 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+     <!-- Assembly Properties -->
+     <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
+     <CheckEolTargetFramework>false</CheckEolTargetFramework>
+     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+     <LangVersion>latest</LangVersion>
+     <Nullable>enable</Nullable>
+     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+     <Version>1.1.2</Version>
+ 
+     <!-- Package Properties -->
+     <Authors>Matt Nadareski</Authors>
+     <Copyright>Copyright (c)2016-2023 motoschifo, Matt Nadareski</Copyright>
+     <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+     <RepositoryUrl>https://github.com/SabreTools/SabreTools</RepositoryUrl>
+     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
+  <!-- Support for old .NET versions -->
+  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))">
+    <PackageReference Include="Net30.LinqBridge" Version="1.3.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/SabreTools.Core/SabreTools.Core.csproj b/SabreTools.Core/SabreTools.Core.csproj
index 6055520c..e1facf79 100644
--- a/SabreTools.Core/SabreTools.Core.csproj
+++ b/SabreTools.Core/SabreTools.Core.csproj
@@ -24,7 +24,7 @@
     <InternalsVisibleTo Include="SabreTools.Test" />
   </ItemGroup>
 
-    <!-- Support for old .NET versions -->
+  <!-- Support for old .NET versions -->
   <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))">
     <PackageReference Include="Net30.LinqBridge" Version="1.3.0" />
   </ItemGroup>