diff --git a/application/GW2 Addon Manager/Application.csproj b/application/GW2 Addon Manager/Application.csproj
index 74a8e99..87ed2d4 100644
--- a/application/GW2 Addon Manager/Application.csproj	
+++ b/application/GW2 Addon Manager/Application.csproj	
@@ -263,15 +263,15 @@
     <Content Include="Resources\config_template.yaml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\GW2-UOAOU-UI.png">
+    <Resource Include="Resources\GW2-UOAOU-UI.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </Resource>
     <None Include="Resources\logo.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="Resources\GitHub-Mark-32px.png">
+    <Resource Include="Resources\GitHub-Mark-32px.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="IWshRuntimeLibrary">
diff --git a/application/GW2 Addon Manager/Backend/Configuration/SelfUpdate.cs b/application/GW2 Addon Manager/Backend/Configuration/SelfUpdate.cs
index aad11ed..8a1c225 100644
--- a/application/GW2 Addon Manager/Backend/Configuration/SelfUpdate.cs	
+++ b/application/GW2 Addon Manager/Backend/Configuration/SelfUpdate.cs	
@@ -44,6 +44,7 @@ public async Task downloadLatestRelease()
             if (Directory.Exists(update_folder))
                 Directory.Delete(update_folder, true);
 
+            //check application version
             dynamic latestInfo = UpdateHelpers.GitReleaseInfo(applicationRepoUrl);
             string downloadUrl = latestInfo.assets[0].browser_download_url;
 
diff --git a/application/GW2 Addon Manager/Backend/Updating/GenericUpdater.cs b/application/GW2 Addon Manager/Backend/Updating/GenericUpdater.cs
index 23149ca..5020574 100644
--- a/application/GW2 Addon Manager/Backend/Updating/GenericUpdater.cs	
+++ b/application/GW2 Addon Manager/Backend/Updating/GenericUpdater.cs	
@@ -161,9 +161,13 @@ private void Install()
 
                     FileSystem.CopyFile(fileName, Path.Combine(Path.Combine(addon_install_path, "arcdps"), Path.GetFileName(fileName)));
                 }
+
                 
             }
 
+            //removing download from temp folder to avoid naming clashes
+            FileSystem.DeleteFile(fileName);
+
             if (userConfig.version.ContainsKey(addon_info.folder_name))
                 userConfig.version[addon_info.folder_name] = latestVersion;
             else
diff --git a/application/GW2 Addon Manager/Backend/Updating/UpdateHelpers.cs b/application/GW2 Addon Manager/Backend/Updating/UpdateHelpers.cs
index 5bd1ffb..c4b0039 100644
--- a/application/GW2 Addon Manager/Backend/Updating/UpdateHelpers.cs	
+++ b/application/GW2 Addon Manager/Backend/Updating/UpdateHelpers.cs	
@@ -8,6 +8,7 @@ namespace GW2_Addon_Manager
 {
     class UpdateHelpers
     {
+        //TODO: Add catch if Github API is down/rejects call
         public static dynamic GitReleaseInfo(string gitUrl)
         {
             var client = new WebClient();