diff --git a/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs b/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs
index 494bdd1..511ff28 100644
--- a/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs
+++ b/Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs
@@ -17,9 +17,9 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
         }
 
         public SafeNameplateObject SafeNameplateObject { get; set; }
-        public SeString Title { get; set; }
-        public SeString Name { get; set; }
-        public SeString FreeCompany { get; set; }
+        public SeString Title { get; internal set; }
+        public SeString Name { get; internal set; }
+        public SeString FreeCompany { get; internal set; }
 
         public bool IsTitleAboveName
         {
diff --git a/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs b/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
index b33c372..3accdbb 100644
--- a/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
+++ b/Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Pilz.Dalamud.Nameplates.EventArgs;
 using Pilz.Dalamud.Tools.Strings;
 
 namespace Pilz.Dalamud.Nameplates.Tools
@@ -18,6 +19,13 @@ namespace Pilz.Dalamud.Nameplates.Tools
             changes.Add(NameplateElements.FreeCompany, new());
         }
 
+        public NameplateChanges(AddonNamePlate_SetPlayerNameManagedEventArgs eventArgs) : this()
+        {
+            GetProps(NameplateElements.Title).Destination = eventArgs.Title;
+            GetProps(NameplateElements.Name).Destination = eventArgs.Name;
+            GetProps(NameplateElements.FreeCompany).Destination = eventArgs.FreeCompany;
+        }
+
         /// <summary>
         /// Gets the properties with the changes of an element of your choice where you can add your payloads to a change and setup some options.
         /// </summary>
diff --git a/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs b/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs
index 56f7017..201bcf5 100644
--- a/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs
+++ b/Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs
@@ -12,5 +12,14 @@ namespace Pilz.Dalamud.Nameplates.Tools
         /// All the changes to the nameplate that should be made.
         /// </summary>
         public NameplateChanges Changes { get; set; }
+
+        public NameplateChangesProps()
+        {
+        }
+
+        public NameplateChangesProps(NameplateChanges changes) : this()
+        {
+            Changes = changes;
+        }
     }
 }
diff --git a/Pilz.Dalamud/Pilz.Dalamud.csproj b/Pilz.Dalamud/Pilz.Dalamud.csproj
index 262ee3e..5e4ce86 100644
--- a/Pilz.Dalamud/Pilz.Dalamud.csproj
+++ b/Pilz.Dalamud/Pilz.Dalamud.csproj
@@ -21,9 +21,10 @@
         <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
         <Copyright>Pilzinsel64</Copyright>
         <PackageProjectUrl>https://github.com/Pilzinsel64/Pilz.Dalamud</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
         <RepositoryUrl>https://github.com/Pilzinsel64/Pilz.Dalamud</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>0.2.0</Version>
+        <Version>0.3.1</Version>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
   
@@ -58,4 +59,8 @@
         </Reference>
     </ItemGroup>
 
+    <ItemGroup>
+      <None Include="..\README.md" Pack="true" PackagePath="\"/>
+    </ItemGroup>
+
 </Project>
diff --git a/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs b/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs
index ab3423a..3c240f5 100644
--- a/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs
+++ b/Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs
@@ -98,14 +98,14 @@ namespace Pilz.Dalamud.Tools.Strings
                 if (tagPosition == StringPosition.Before)
                 {
                     var significantPayloads = payloads.Where(payload => payload is TextPayload || payload is IconPayload);
-                    if (significantPayloads.Last() is TextPayload)
+                    if (significantPayloads.LastOrDefault() is TextPayload)
                         payloads.Add(getNewTextPayload());
                 }
                 // Decide whether to add a space to the beginning
                 else if (tagPosition == StringPosition.After)
                 {
                     var significantPayloads = payloads.Where(payload => payload is TextPayload || payload is IconPayload);
-                    if (significantPayloads.First() is TextPayload)
+                    if (significantPayloads.FirstOrDefault() is TextPayload)
                         payloads.Insert(0, getNewTextPayload());
                 }
             }